Skip to content

Commit 693edb0

Browse files
djw8605djw8605
committed
Merge branch 'master' of https://github.com/opensciencegrid/StashCache into add_writeback
2 parents a520e65 + 24c2b1e commit 693edb0

9 files changed

Lines changed: 109 additions & 27 deletions

File tree

‎bin/stashcp2/tests/test_inside_docker.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,13 @@ ls -lah
8181

8282
rm -rf queries
8383

84-
/StashCache/bin/stashcp --cache=$XRD_CACHE -d /xenon/rucio/x1t_SR001_170419_1605_mv/73/90/XENON1T-0-000008000-000008999-000001000.zip ./
85-
86-
result=`md5sum XENON1T-0-000008000-000008999-000001000.zip | awk '{print $1;}'`
87-
if [ "$result" != "dd00dd6a6b1e0de4a3b8ecf1a34b24b3" ]; then
88-
exit 1
89-
fi
84+
# Remove xenon tests as they have been failing consistently, and unable to reach
85+
# maintainers that asked for the test in the first place
86+
#/StashCache/bin/stashcp --cache=$XRD_CACHE -d /xenon/rucio/x1t_SR001_170419_1605_mv/73/90/XENON1T-0-000008000-000008999-000001000.zip ./
87+
#result=`md5sum XENON1T-0-000008000-000008999-000001000.zip | awk '{print $1;}'`
88+
#if [ "$result" != "dd00dd6a6b1e0de4a3b8ecf1a34b24b3" ]; then
89+
# exit 1
90+
#fi
9091

9192

9293

‎docs/admin/configure-cache-auth.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ It is very important to keep CRL list updated from cron:
119119
[root@client ~]$ systemctl daemon-reload
120120

121121

122-
### RHEL6
123-
...to be added
124-
125122
### Add Authfile for authenticated cache
126123
Authfile for authenticated cache may differ from `/etc/xrootd/Authfile-noauth` defined in [non-authenticated cache configuration](configure-cache.md). Example:
127124
```

‎docs/admin/configure-cache.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Packages installed: `stashcache-daemon fetch-crl stashcache-cache-server`
55
The following section describes required configuration to have a functional non-authenticated StashCache Cache (not origin server!). StashCache Cache package `stashcache-cache-server` needs to be manually configured from pre-existing XRootD configuration.
66

77
## Cache server
8-
!!! Note:
8+
!!! note
99
While example of the configuration file below provides combination of _authenticated_ and _non-authenticated_ _Cache_, the non-authenticated cache is considered to be default and authenticated cache just optional (additional) service. If you're about to configure in addition _authenticated cache_ read to the end of this document and then follow post-installation of [authenticated part here](configure-cache-auth.md).
1010

1111
For configuring **cache** one needs to define directive `pss.origin redirector.osgstorage.org:1024` (not `all.manager redirector.osgstorage.org+ 1213` directive as it is in case of [configuring origin](configure-origin.md)).
@@ -113,13 +113,12 @@ In Authfile you want to allow local reads below `$(cachedir)` defined in the mai
113113

114114
### RHEL7
115115
On RHEL7 system, you need to run following systemd unit:
116+
116117
* `systemctl start xrootd@stashcache-cache-server.service`
118+
117119
* `systemctl start condor.service`
118120

119121
Please, refer to [start services document](../ops/start.md) for more information.
120122

121-
### RHEL6
122-
...to be added, old doc for RHEL6 configuration resides temporarily [here](https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallStashCache).
123-
124123
When ready with configuration, please [register](../ops/register.md) and [start](../ops/start.md) your StashCache Cache server.
125124
If you'd like to configure in addition authenticated cache instance, please follow [this](configure-cache-auth.md) document.

‎docs/admin/install.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ If installing the (optional) authenticated StashCache, you need to do in additio
3131

3232
As with all OSG software installations, there are some one-time steps to prepare in advance:
3333

34-
* Ensure the host has [a supported operating system](https://twiki.grid.iu.edu/bin/view/Documentation/Release3/SupportedOperatingSystems)
34+
* Ensure the host has [a supported operating system](https://opensciencegrid.github.io/docs/release/supported_platforms/)
3535
* Obtain root access to the host
36-
* Prepare [the required Yum repositories](https://twiki.grid.iu.edu/bin/view/Documentation/Release3/YumRepositories)
37-
* Install [CA certificates](https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCertAuth)
36+
* Prepare [the required Yum repositories](http://opensciencegrid.github.io/docs/common/yum/)
37+
* Install [CA certificates](https://opensciencegrid.github.io/docs/common/ca/)
3838

3939
## Installing the StashCache metapackage
4040

‎docs/css/extra.css‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,83 @@ div.col-md-9 h1:first-of-type .headerlink {
1818

1919
code.no-highlight {
2020
color: black;
21-
}
21+
}
22+
23+
.codehilite{
24+
width:100%;
25+
height: auto;
26+
overflow: auto;
27+
margin-bottom: 24px;
28+
}
29+
30+
.codehilite .hll { background-color: #ffffcc }
31+
.codehilite { background: #f0f0f0; }
32+
.codehilite .c { color: #60a0b0; font-style: italic } /* Comment */
33+
.codehilite .err { border: 1px solid #FF0000 } /* Error */
34+
.codehilite .k { color: #007020; font-weight: bold } /* Keyword */
35+
.codehilite .o { color: #666666 } /* Operator */
36+
.codehilite .cm { color: #60a0b0; font-style: italic } /* Comment.Multiline */
37+
.codehilite .cp { color: #007020 } /* Comment.Preproc */
38+
.codehilite .c1 { color: #60a0b0; font-style: italic } /* Comment.Single */
39+
.codehilite .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */
40+
.codehilite .gd { color: #A00000 } /* Generic.Deleted */
41+
.codehilite .ge { font-style: italic } /* Generic.Emph */
42+
.codehilite .gr { color: #FF0000 } /* Generic.Error */
43+
.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
44+
.codehilite .gi { color: #00A000 } /* Generic.Inserted */
45+
.codehilite .go { color: #808080 } /* Generic.Output */
46+
.codehilite .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
47+
.codehilite .gs { font-weight: bold } /* Generic.Strong */
48+
.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
49+
.codehilite .gt { color: #0040D0 } /* Generic.Traceback */
50+
.codehilite .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
51+
.codehilite .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
52+
.codehilite .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
53+
.codehilite .kp { color: #007020 } /* Keyword.Pseudo */
54+
.codehilite .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
55+
.codehilite .kt { color: #902000 } /* Keyword.Type */
56+
.codehilite .m { color: #40a070 } /* Literal.Number */
57+
.codehilite .s { color: #4070a0 } /* Literal.String */
58+
.codehilite .na { color: #4070a0 } /* Name.Attribute */
59+
.codehilite .nb { color: #007020 } /* Name.Builtin */
60+
.codehilite .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
61+
.codehilite .no { color: #60add5 } /* Name.Constant */
62+
.codehilite .nd { color: #555555; font-weight: bold } /* Name.Decorator */
63+
.codehilite .ni { color: #d55537; font-weight: bold } /* Name.Entity */
64+
.codehilite .ne { color: #007020 } /* Name.Exception */
65+
.codehilite .nf { color: #06287e } /* Name.Function */
66+
.codehilite .nl { color: #002070; font-weight: bold } /* Name.Label */
67+
.codehilite .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
68+
.codehilite .nt { color: #062873; font-weight: bold } /* Name.Tag */
69+
.codehilite .nv { color: #bb60d5 } /* Name.Variable */
70+
.codehilite .ow { color: #007020; font-weight: bold } /* Operator.Word */
71+
.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
72+
.codehilite .mf { color: #40a070 } /* Literal.Number.Float */
73+
.codehilite .mh { color: #40a070 } /* Literal.Number.Hex */
74+
.codehilite .mi { color: #40a070 } /* Literal.Number.Integer */
75+
.codehilite .mo { color: #40a070 } /* Literal.Number.Oct */
76+
.codehilite .sb { color: #4070a0 } /* Literal.String.Backtick */
77+
.codehilite .sc { color: #4070a0 } /* Literal.String.Char */
78+
.codehilite .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
79+
.codehilite .s2 { color: #4070a0 } /* Literal.String.Double */
80+
.codehilite .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
81+
.codehilite .sh { color: #4070a0 } /* Literal.String.Heredoc */
82+
.codehilite .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
83+
.codehilite .sx { color: #c65d09 } /* Literal.String.Other */
84+
.codehilite .sr { color: #235388 } /* Literal.String.Regex */
85+
.codehilite .s1 { color: #4070a0 } /* Literal.String.Single */
86+
.codehilite .ss { color: #517918 } /* Literal.String.Symbol */
87+
.codehilite .bp { color: #007020 } /* Name.Builtin.Pseudo */
88+
.codehilite .vc { color: #bb60d5 } /* Name.Variable.Class */
89+
.codehilite .vg { color: #bb60d5 } /* Name.Variable.Global */
90+
.codehilite .vi { color: #bb60d5 } /* Name.Variable.Instance */
91+
.codehilite .il { color: #40a070 } /* Literal.Number.Integer.Long */
92+
93+
.wy-nav-content {
94+
max-width: 90%;
95+
}
96+
97+
code, tt {
98+
font-size: 100%;
99+
}
100+

‎docs/ops/register.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
To join in on the monitoring you'll need to Register your resource and send me some information about your cache instructions in the Configuring resource monitoring.
44

55
You can see the current state of affairs here:
6-
* [Status history](http://myosg.grid.iu.edu/rgstatushistory/index?downtime_attrs_showpast=&account_type=cumulative_hours&ce_account_type=gip_vo&se_account_type=vo_transfer_volume&bdiitree_type=total_jobs&bdii_object=service&bdii_server=is-osg&start_type=yesterday&start_date=08%2F28%2F2015&end_type=now&end_date=08%2F28%2F2015&rg=on&rg_sel%5B%5D=433&active=on&active_value=1&disable_value=1)
7-
* [Status details](http://myosg.grid.iu.edu/rgcurrentstatus/index?datasource=currentstatus&rg=on&rg_433=on&end_type=now&active=on&active_value=1) (click on the "+" sign for more detail)
8-
* [Availability metrics](http://myosg.grid.iu.edu/rgarmetric/index?downtime_attrs_showpast=&account_type=cumulative_hours&ce_account_type=gip_vo&se_account_type=vo_transfer_volume&bdiitree_type=total_jobs&bdii_object=service&bdii_server=is-osg&start_type=7daysago&start_date=08%2F28%2F2015&end_type=now&end_date=08%2F28%2F2015&rg=on&rg_sel%5B%5D=433&active=on&active_value=1&disable_value=1)
6+
* [Status history](http://my.opensciencegrid.org/rgstatushistory/index?downtime_attrs_showpast=&account_type=cumulative_hours&ce_account_type=gip_vo&se_account_type=vo_transfer_volume&bdiitree_type=total_jobs&bdii_object=service&bdii_server=is-osg&start_type=yesterday&start_date=08%2F28%2F2015&end_type=now&end_date=08%2F28%2F2015&rg=on&rg_sel%5B%5D=433&active=on&active_value=1&disable_value=1)
7+
* [Status details](http://my.opensciencegrid.org/rgcurrentstatus/index?datasource=currentstatus&rg=on&rg_433=on&end_type=now&active=on&active_value=1) (click on the "+" sign for more detail)
8+
* [Availability metrics](http://my.opensciencegrid.org/rgarmetric/index?downtime_attrs_showpast=&account_type=cumulative_hours&ce_account_type=gip_vo&se_account_type=vo_transfer_volume&bdiitree_type=total_jobs&bdii_object=service&bdii_server=is-osg&start_type=7daysago&start_date=08%2F28%2F2015&end_type=now&end_date=08%2F28%2F2015&rg=on&rg_sel%5B%5D=433&active=on&active_value=1&disable_value=1)
99

1010
## Registering StashCache
11-
To register a cache instance go [here](https://oim.grid.iu.edu/oim/resourceedit) (with a cert in your browser). Fill in the required fields, example is displayed below:
11+
To register a cache instance go [here](https://oim.opensciencegrid.org/oim/resourceedit) (with a cert in your browser). Fill in the required fields, example is displayed below:
1212

1313
### Registering StashCache resource information:
1414
* The site __must be__ _OSG-GOC_

‎docs/ops/troubleshoot.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Common settings on the system:
88

99
First you need to activate xrootd to create core file when process exits unexpectedly:
1010

11-
* set env variable upon cmsd/xrootd start `DAEMON_COREFILE_LIMIT="unlimited"`
12-
RHEL6: env set in `/etc/sysconfig/xrootd`
13-
RHEL7: you can use `/etc/sysconfig/xrootd` but prepare override file `/etc/systemd/system/cmsd@clustered.service.d/override.conf` with content:
11+
* set environment variable upon cmsd/xrootd start `DAEMON_COREFILE_LIMIT="unlimited"`
12+
* RHEL6: variable set in `/etc/sysconfig/xrootd` or set as root `ulimit -c unlimited`
13+
* RHEL7: you can use `/etc/sysconfig/xrootd` but prepare override file `/etc/systemd/system/cmsd@clustered.service.d/override.conf` with content:
1414
```
1515
[Service]
1616
EnvironmentFile=-/etc/sysconfig/xrootd
@@ -27,3 +27,6 @@ $ gdb --pid=PID_NR
2727
```
2828
`$ gcore $(pidof xrootd)`
2929
```
30+
31+
### Core from not running process:
32+
* by default, XRootD should leave `core file` in the `/var/spool/xrootd/` when it crashes

‎docs/ops/upgrades.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ This page is used to track the status of hardware and software used for the Stas
66

77
| **Hosting site** | **Hostname** | **XRootD version** | **OS** | **CPU** | **RAM** | **Disk (cache) space** | **Disk configuration** | **Connectivity** | **Notes** | **Last update** |
88
|------------------|--------------|--------------------|--------|---------|---------|------------------------|------------------------|------------------|-----------|-----------------|
9-
| Syracuse | its-condor-xrootd1.syr.edu | | | | | | | | | |
9+
| Syracuse | its-condor-xrootd1.syr.edu | xrootd-server-4.7.0-1.osg33.el7.x86_64 | CentOS 7.2.1511 | Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz (8 cores) | 65GB | 16TB | | 10Gbps | | 11-03-2017 |
1010
| BNL | osgxroot.usatlas.bnl.gov | | | | | | | | | |
11-
| FZU | novastore.farm.particle.cz | 4.4.0 | | 2x Xeon(R) E5-2630 @2.30GHz | 32GB | 30TB | 12x3TB, RAID6, XFS | 10Gbps | | 10-28-2016 |
11+
| FZU | stash.farm.particle.cz | 4.8.0-1.osg34 | CentOS 7.4.1708 | 2x Xeon(R) E5-2630 v4 @2.20GHz | 128GB | 30TB | 5x8TB, RAID-Z1, ZFS, 1TB NVMe Cache | 10Gbps | Container | 2-2-2018 |
1212
| Nebraska | hcc-stash.unl.edu | 4.6.1-0.2.pre3.hcc | CentOS 7.2.1511 | 2x Xeon (R) E5530 @2.4GHz w/HT (8 real cores) | 24GB | 19TB | 12x 2TB SATA in RAID6, XFS | 10Gbps | | 04-06-2017 |
13-
| UChicago | stashcache.grid.uchicago.edu | 4.6.1-0.2.pre3.hcc | SL 7.2 | 2x Xeon(R) E5440 @2.83GHz | 32GB | 60TB | 5x 12TB arrays, RAID6, XFS, bound with oss.space | 2x10Gbps | Old dCache node, probably not optimally tuned for XRootD | 04-06-2017 |
13+
| UChicago | stashcache.grid.uchicago.edu | 4.7.1-1 | SL 7.3 | 2x Xeon(R) E5440 @2.83GHz | 32GB | 60TB | 5x 12TB arrays, RAID6, XFS, bound with oss.space | 2x10Gbps | Old dCache node, probably not optimally tuned for XRootD | 11-07-2017 |
1414
| UIllinois | mwt2-stashcache.campuscluster.illinois.edu | 4.6.1-0.2.rc3.osg33 | | VM 4CPUS | 16GB | 100TB | GPFS on DDN via FDR IB | 10Gbps | | 04-28-2017 |
1515
| UCSD | xrd-cache-1.t2.ucsd.edu | 4.5.0-0.5.beta | CentOS 6.8 | 2x Xeon(R) E5-2650 v3 @2.30GHz w/HT (40 cores total) | 128GB | 21.8TB | 6x 3.6TB, XFS, individual disks bound with oss.space | 10Gbps | The same machine runs hdfs-healing xrootd cache on another set of 6 independent disks. We can move more disks to StashCache if needed. | 10-28-2016 |
1616

‎mkdocs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ site_url: https://opensciencegrid.github.io/stashcache
33
repo_url: https://github.com/opensciencegrid/stashcache
44
theme: readthedocs
55

6+
extra_css:
7+
- css/extra.css
8+
69
pages:
710
- Home: 'index.md'
811
- Install: 'admin/install.md'

0 commit comments

Comments
 (0)