Skip to content

Commit

Permalink
spacemanager: Move dcache.enable.space-reservation to proper file
Browse files Browse the repository at this point in the history
It was originally declared in spacemanager.properties because it inherited
from a now deprecated space manager property. Since that's no longer the
case, we may just as well move it to the "normal" place.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Milar <paul.millar@desy.de>
Patch: https://rb.dcache.org/r/7576/
  • Loading branch information
gbehrmann committed Dec 10, 2014
1 parent fced715 commit cb39909
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
10 changes: 10 additions & 0 deletions skel/share/defaults/dcache.properties
Expand Up @@ -649,6 +649,16 @@ dcache.authn.vomsdir=${dcache.paths.grid-security}/vomsdir
(forbidden)overwriteEnabled = Use dcache.enable.overwrite
(one-of?true|false)dcache.enable.overwrite = true

# ---- Whether space reservation should be supported.
#
# Whether to support space reservations in this dCache instance. This
# controls whether services expect a space manager to operate. You
# still need to instantiate the spacemanager service by adding it to
# the layout file on one of the dCache nodes (preferrably in the same
# domain as the poolmanager service).
#
(one-of?true|false)dcache.enable.space-reservation=false

# ---- Upload directory
#
# Some protocols (currently just SRM) allow a client to upload a file and, once
Expand Down
11 changes: 1 addition & 10 deletions skel/share/defaults/spacemanager.properties
Expand Up @@ -3,16 +3,6 @@
# -----------------------------------------------------------------------
@DEFAULTS_HEADER@

# ---- Whether space reservation should be supported.
#
# Whether to support space reservations in this dCache instance. This
# controls whether services expect a space manager to operate. You
# still need to instantiate the spacemanager service by adding it to
# the layout file on one of the dCache nodes.
#
(forbidden)srmSpaceManagerEnabled = Use dcache.enable.space-reservation
(one-of?true|false)dcache.enable.space-reservation=false

# ---- Cell name of space manager
#
# This property defines the cell name of the space manager service.
Expand Down Expand Up @@ -136,3 +126,4 @@ spacemanager.db.schema.changelog=diskCacheV111/services/space/db/spacemanager.ch
(obsolete)DefaultAccessLatencyForSpaceReservation = No longer used
(obsolete)spacemanager.default-access-latency = No longer used
(obsolete)spacemanager.default-retention-policy = No longer used
(forbidden)srmSpaceManagerEnabled = Use dcache.enable.space-reservation

0 comments on commit cb39909

Please sign in to comment.