Skip to content

Commit

Permalink
config: add obsolete|forbidden annotation for dropped properties
Browse files Browse the repository at this point in the history
Motivation:

Providing dropped properties with an obsolete or forbidden annotation
allows the admin to discover changes that might affect their dCache
instance.  This is both through manual inspection and through the
'dcache check-config' command.

Modification:

Add annotations and, where appropriate, descriptions to support admins
as they upgrade.

Result:

Hopefully fewer support tickets.

Target: master
Request: 3.1
Request: 3.0
Request: 2.16
Require-notes: yes
Require-book: no
Patch: https://rb.dcache.org/r/10328/
Acked-by: Albert Rossi

Conflicts:
	skel/share/defaults/dcache.properties

Conflicts:
	skel/share/defaults/dcache.properties

Conflicts:
	skel/share/defaults/billing.properties
	skel/share/defaults/dcache.properties
	skel/share/defaults/poolmanager.properties
	skel/share/defaults/srm.properties
  • Loading branch information
paulmillar committed Jul 12, 2017
1 parent f5397c6 commit dbf4b49
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
4 changes: 4 additions & 0 deletions skel/share/defaults/billing.properties
Original file line number Diff line number Diff line change
Expand Up @@ -409,3 +409,7 @@ billing.service.poolmanager.timeout = 3600000
(one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)billing.service.poolmanager.timeout.unit=MILLISECONDS
billing.service.poolmanager=${dcache.service.poolmanager}

## Old properties that are no longer supported
(obsolete)billing.db.inserts.max-before-commit =
(obsolete)billing.db.inserts.timeout-before-commit =
(obsolete)billing.db.inserts.timeout-before-commit.unit =
5 changes: 5 additions & 0 deletions skel/share/defaults/chimera.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ chimera.db.password.file = ${dcache.db.password.file}
chimera.db.schema.changelog = org/dcache/chimera/changelog/changelog-master.xml

(obsolete)chimera.db.dialect = Not used any more
(obsolete)chimera.db.jar = dCache auto-detects which driver to use
(obsolete)chimera.db.jar-when-H2 = dCache auto-detects which driver to use
(obsolete)chimera.db.jar-when-HsqlDB = dCache auto-detects which driver to use
(obsolete)chimera.db.jar-when-PgSQL = dCache auto-detects which driver to use
(obsolete)chimera.db.jar-when-PgSQL95 = dCache auto-detects which driver to use
1 change: 1 addition & 0 deletions skel/share/defaults/dcache.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1018,3 +1018,4 @@ dcache.description =
(obsolete)dcache.broker.messaging.port = Use dcache.broker.port
(obsolete)dcache.authn.gsi.crl.cache.lifetime = No longer configurable
(obsolete)dcache.service.copymanager =
(obsolete)dcache.service.broadcast = The broadcast service has been removed.
2 changes: 2 additions & 0 deletions skel/share/defaults/poolmanager.properties
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ poolmanager.pool-monitor.update-period = ${dcache.pool-monitor.update-period}
poolmanager.pool-monitor.update-period.unit = ${dcache.pool-monitor.update-period.unit}

poolmanager.pool-monitor.max-updates-per-second = ${dcache.pool-monitor.max-updates-per-second}

(forbidden)poolmanager.plugins.selection-unit =
10 changes: 7 additions & 3 deletions skel/share/defaults/srm.properties
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ srm.ping-extra-info!backend_version = ${dcache.version}
(obsolete)srm.request.copy.threads = See srm.request.*.max-inprogress
(obsolete)srm.request.ls.threads = See srm.request.*.max-inprogress
(obsolete)srm.request.reserve-space.threads = See srm.request.*.max-inprogress
(obsolete)srm.request.retries=10
(obsolete)srm.request.retries=
(obsolete)srm.request.get.retries =
(obsolete)srm.request.bring-online.retries =
(obsolete)srm.request.put.retries =
Expand Down Expand Up @@ -449,6 +449,10 @@ srm.ping-extra-info!backend_version = ${dcache.version}
(obsolete)srm.enable.space-reservation =
(obsolete)srm.enable.third-party.requiring-verification-by-default =
(obsolete)srm.request.maximum-client-assumed-bandwidth =
(obsolete)srm.enable.custom-get-host-by-address
(obsolete)srm.enable.custom-get-host-by-address =
(obsolete)srm.client-transport =
(obsolete)srm.authn.vomsdir =
(obsolete)srm.authn.vomsdir =
(obsolete)srm.net.host =
(obsolete)srm.net.local-hosts =
(obsolete)srm.ping-extra-info =
(obsolete)srm.root =

0 comments on commit dbf4b49

Please sign in to comment.