Skip to content

Commit dba257f

Browse files
paulmillarmksahakyan
authored andcommitted
transfermanagers: complete removal of DB support
Motivation: Commit 5a0a09e removed support for serialising the transfermanager state in a database. Unfortunately, the commit failed to update system-test (which configures transfermanagers to use a database) and the hsqldb configuration. The commit also had a few (minor) stylistic and syntactic issues. Modification: Disable the use of a database in system-test for the transfermanagers service. Remove hsqldb-specific configuration for transfermanagers db. Mark the `transfermanagers.enable.db` property obsolete. Fix the multi-annotated property to use the correct syntax: `(obsolete)(prefix)` to `(obsolete,prefix)`. Move obsolete properties to the end of the defaults file. Result: System-test now builds. Target: master Requires-notes: yes Requires-book: no Request: 11.1 Request: 11.0 Request: 10.2 Request: 10.1 Patch: https://rb.dcache.org/r/14565/ Acked-by: Tigran Mkrtchyan
1 parent e8daadb commit dba257f

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

packages/system-test/src/main/skel/etc/layouts/system-test.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ ftp.authn.protocol=gsi
138138
ftp.net.internal=127.0.0.1
139139

140140
[dCacheDomain/transfermanagers]
141-
transfermanagers.enable.db=true
142141

143142
[dCacheDomain/xrootd]
144143
xrootd.cell.name=Xrootd-${host.name}

plugins/hsqldb/src/main/skel/hsqldb.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ spacemanager.db.hikari-properties!maxLifetime = 0
2525
srmmanager.db.url = jdbc:hsqldb:file:${hsqldb.path}/${srmmanager.db.name};shutdown=true;hsqldb.tx=mvcc;hsqldb.sqllog=3
2626
srmmanager.db.hikari-properties!maxLifetime = 0
2727

28-
transfermanagers.db.url = jdbc:hsqldb:file:${hsqldb.path}/${transfermanagers.db.name};shutdown=true;hsqldb.tx=mvcc;hsqldb.sqllog=3
29-
3028
alarms.url-when-type-is-off =
3129
alarms.url-when-type-is-xml = xml:file:${alarms.db.xml.path}
3230
alarms.url-when-type-is-rdbms = jdbc:hsqldb:file:${hsqldb.path}/${alarms.db.name};shutdown=true;hsqldb.tx=mvcc;hsqldb.sqllog=3

skel/share/defaults/transfermanagers.properties

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,6 @@ transfermanagers.limits.transfer-time = 7200
8484
# Whether space reservations should be supported for third party SRM copy transfers.
8585
(one-of?true|false|${dcache.enable.space-reservation})transfermanagers.enable.space-reservation=${dcache.enable.space-reservation}
8686

87-
# Database settings
88-
# Obsolete
89-
(one-of?true|false)transfermanagers.enable.db=false
90-
(obsolete)transfermanagers.db.host = DB functionality is removed
91-
(obsolete)transfermanagers.db.name = DB functionality is removed
92-
(obsolete)transfermanagers.db.user = DB functionality is removed
93-
(obsolete)transfermanagers.db.password = DB functionality is removed
94-
(obsolete)transfermanagers.db.password.file = DB functionality is removed
95-
(obsolete)transfermanagers.db.url= DB functionality is removed
96-
(obsolete)(prefix)transfer-manager.db.hikari-properties = DB functionality is removed
97-
98-
99-
# The transfermanagers service automatically manages its database schema
100-
(obsolete)(immutable)transfermanagers.db.schema.auto=DB functionality is removed
101-
10287
# Kafka
10388
(one-of?true|false|${dcache.enable.kafka})transfermanagers.enable.kafka = ${dcache.enable.kafka}
10489
transfermanagers.kafka.topic = ${dcache.kafka.topic}
@@ -107,3 +92,12 @@ transfermanagers.kafka.producer.bootstrap.servers = ${dcache.kafka.bootstrap-ser
10792

10893
# Obsolete
10994
(obsolete)transfermanagers.cell.export = See transfermanagers.cell.consume
95+
(obsolete)transfermanagers.enable.db=DB functionality is removed
96+
(obsolete)transfermanagers.db.host = DB functionality is removed
97+
(obsolete)transfermanagers.db.name = DB functionality is removed
98+
(obsolete)transfermanagers.db.user = DB functionality is removed
99+
(obsolete)transfermanagers.db.password = DB functionality is removed
100+
(obsolete)transfermanagers.db.password.file = DB functionality is removed
101+
(obsolete)transfermanagers.db.url= DB functionality is removed
102+
(obsolete,prefix)transfer-manager.db.hikari-properties = DB functionality is removed
103+
(obsolete)transfermanagers.db.schema.auto=DB functionality is removed

0 commit comments

Comments
 (0)