Skip to content

Commit

Permalink
srm-client: drop support for SRM v1.1
Browse files Browse the repository at this point in the history
Motivation:

The SRM v1.1 protocol is *long* dead.

Support in dCache for v1.1 was made optional and disabled by default in
2015 (dCache v2.14) and support for SRM v1.1 dropped altogether in 2016
(dCache v2.16).

This code simplication is in preparation for adding support bearer
tokens.

Modification:

Drop all SRM v1.1-only commands.

Drop configuration that allows selection of SRM v1.1 or SRM v2.2.

Drop resulting dead-code.

Result:

srm-client no longer supports SRM v1.1.

Target: master
Request: 6.2
Requires-notes: yes (srm-client)
Requires-book: no
Patch: https://rb.dcache.org/r/12570/
Acked-by: Tigran Mkrtchyan
  • Loading branch information
paulmillar committed Sep 10, 2020
1 parent 5d0c8c9 commit 7fd6dba
Show file tree
Hide file tree
Showing 25 changed files with 20 additions and 2,316 deletions.
3 changes: 1 addition & 2 deletions docs/TheBook/src/main/markdown/cookbook-clients.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ Usage:
Example 22.1. surveying the space tokens available in a directory.

```console-user
srm-get-space-tokens srm://dcache.example.org -srm_protocol_version=2
srm-get-space-tokens srm://dcache.example.org
```

A successful result:
Expand Down Expand Up @@ -363,7 +363,6 @@ Example:
```console-user
srm-reserve-space \
|-desired_size 2000 \
|-srm_protocol_version=2 \
|-retention_policy=REPLICA \
|-access_latency=ONLINE \
|-guaranteed_size 1024 \
Expand Down
1 change: 0 additions & 1 deletion docs/TheBook/src/main/markdown/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Part IV. Reference
+ [27. dCache Clients](rf-clients-srm.md)
- [The SRM Client Suite](rf-clients-srm.md#the-srm-client-suite)
- [srmcp](rf-clients-srm.md#srmcp) — Copy a file from or to an SRM or between two SRMs.
- [srmstage](rf-clients-srm.md#srmstage) — Request staging of a file.
- [dccp](rf-clients-srm.md#dccp)
- [dccp](rf-clients-srm.md#dccp) — Copy a file from or to a dCache server.

Expand Down
17 changes: 0 additions & 17 deletions docs/TheBook/src/main/markdown/rf-clients-srm.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Chapter 27. dCache Clients
+ [The SRM Client Suite](#the-srm-client-suite)

[srmcp](#srmcp) — Copy a file from or to an SRM or between two SRMs.
[srmstage](#srmstage) — Request staging of a file.

+ [dccp](#dccp)
[dccp](#dccp) — Copy a file from or to a dCache server.
Expand Down Expand Up @@ -76,22 +75,6 @@ Example:
srmcp --streams_num=1 --server_mode=active sourceUrl destinationUrl
```

### Description

### srmstage
srmstage - Request staging of a file.

### synopsis
srmstage[srmUrl]

Arguments
srmUrl
The URL of the file which should be staged.

### Description

Provides an option to the user to stage files from HSM to dCache and not transfer them to the user right away. This case will be useful if files are not needed right away at user end, but its good to stage them to dcache for faster access later.

### dccp

dccp — Copy a file from or to a dCache server.
Expand Down
13 changes: 1 addition & 12 deletions modules/srm-client/README
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
What are the tools available in this package?
_____________________________________________

SRM V1.1 clients: srmcp, srm-get-metadata, srm-get-request-status,
srm-advisory-delete, srmping, srmstage

SRM V2.2 clients: srmcp, srm-reserve-space, srm-release-space,
srmrm, srmrmdir, srmls, srmmkdir, srmmv, srmping, srm-bring-online

Expand All @@ -26,7 +23,7 @@
What is srmcp
-------------

srmcp is the implementation of srm client as specified by srm spec v1.1 and srm spec v2.2
srmcp is the implementation of srm client as specified by srm spec v2.2

What can I use srmcp for.
_______________________
Expand Down Expand Up @@ -90,8 +87,6 @@ Usage: srmcp [command line options] source(s) destination
a pair of positive integers separated by ":",
not set by default
-gss_expected_name=<gss expected name in the srm server DN> default value is host
-srm_protocol_version=<srm protocol version>
or just specify -1 or -2
-conf=<path to the configuration file> default value is config.xml
-save_conf=<path to the file in which the new configuration will be saved>
no transfer will be performed if this option is specified
Expand Down Expand Up @@ -130,13 +125,7 @@ Usage: srmcp [command line options] source(s) destination
-pushmode=<true or false> true to use the push mode in case
of srm Mass Storage Systems (MSS) to MSS copy,
false to use the pull mode, the default mode is pull mode (false)
-srmstage=<true or false, false by default>
if set to true - the source files are staged only onto disk cache
and not transferred to client right away>
if set to false - the source files are transferred to the client
-use_urlcopy_script=<true or false> use java native copiers of use urcopy script
-srm_protocol_version=<1 or 2> 1 for srm 1.1 or 2 for srm 2.2, no other protocols are supported
or just specify -1 or -2
-request_lifetime=<num of seconds> request lifetime in seconds
-copyjobfile=<file> where <file> is the path to the text file containing
the list of sources and destination
Expand Down
5 changes: 0 additions & 5 deletions modules/srm-client/src/main/bin/srm-advisory-delete

This file was deleted.

5 changes: 0 additions & 5 deletions modules/srm-client/src/main/bin/srm-get-metadata

This file was deleted.

5 changes: 0 additions & 5 deletions modules/srm-client/src/main/bin/srm-get-request-status

This file was deleted.

5 changes: 0 additions & 5 deletions modules/srm-client/src/main/bin/srm-storage-element-info

This file was deleted.

5 changes: 0 additions & 5 deletions modules/srm-client/src/main/bin/srmstage

This file was deleted.

Loading

0 comments on commit 7fd6dba

Please sign in to comment.