diff --git a/transfer_service/config/vos_ts.conf.sample b/transfer_service/config/vos_ts.conf.sample index 6f9adf43c522a23c79a4268c0b028a2e528c83ae..14e6c4e432d5ab4132c963c9d39cfe5c57f0e615 100644 --- a/transfer_service/config/vos_ts.conf.sample +++ b/transfer_service/config/vos_ts.conf.sample @@ -30,8 +30,8 @@ port = 6379 ; db index representing the db that stores the scheduling queues, default is 0 db_sched = 0 -# Spectrum Archive -[spectrum_archive] +# IBM Spectrum Protect +[spectrum_protect] ; hostname or IP address of the tape library frontend host = <tape_frontend_hostname> ; SSH port diff --git a/transfer_service/doi_executor.py b/transfer_service/doi_executor.py index 14a999461e365117d302479f1170374765415a96..8d3ea79859c71ca5ef007c2a7e8843101a725d1c 100644 --- a/transfer_service/doi_executor.py +++ b/transfer_service/doi_executor.py @@ -71,7 +71,7 @@ class DOIExecutor(TaskExecutor): 1, 1, self.logger) - params = config.loadSection("spectrum_archive") + params = config.loadSection("spectrum_protect") #self.tapePool = params["tape_pool"] self.tapeClient = TapeClient(params["host"], params.getint("port"), diff --git a/transfer_service/import_executor.py b/transfer_service/import_executor.py index 6deb10c47593756bf0dcc4b010eb61e7d1146458..ed9c43008b02a29395aa849a4c79b7bcd4f5da7a 100644 --- a/transfer_service/import_executor.py +++ b/transfer_service/import_executor.py @@ -50,7 +50,7 @@ class ImportExecutor(TaskExecutor): 1, 1, self.logger) - params = config.loadSection("spectrum_archive") + params = config.loadSection("spectrum_protect") self.tapeClient = TapeClient(params["host"], params.getint("port"), params["user"], diff --git a/transfer_service/retrieve_executor.py b/transfer_service/retrieve_executor.py index d141111db90f4a2abe79cf0435ddc547f291d899..0eac4ea6608d5c33cf729574c87bf4bcec488429 100644 --- a/transfer_service/retrieve_executor.py +++ b/transfer_service/retrieve_executor.py @@ -75,7 +75,7 @@ class RetrieveExecutor(TaskExecutor): 1, 1, self.logger) - params = config.loadSection("spectrum_archive") + params = config.loadSection("spectrum_protect") self.tapeClient = TapeClient(params["host"], params.getint("port"), params["user"], diff --git a/transfer_service/storage_rpc_server.py b/transfer_service/storage_rpc_server.py index 36708cf8e79b63b9d257add3181f726a1666afc4..268b97decdc60ba0a266ba44fe8ebb695e3f6dc5 100644 --- a/transfer_service/storage_rpc_server.py +++ b/transfer_service/storage_rpc_server.py @@ -40,7 +40,7 @@ class StorageRPCServer(RedisRPCServer): 1, 2, self.logger) - params = config.loadSection("spectrum_archive") + params = config.loadSection("spectrum_protect") self.tapeClient = TapeClient(params["host"], params.getint("port"), params["user"], diff --git a/transfer_service/store_executor.py b/transfer_service/store_executor.py index 59aee4f1cf4f029b0689aae42ece40de8da04169..4f7aac290329ebb29679799a88927e83f0fd3015 100644 --- a/transfer_service/store_executor.py +++ b/transfer_service/store_executor.py @@ -24,7 +24,7 @@ from task_executor import TaskExecutor class StoreExecutor(TaskExecutor): - + # We use 10 GB of tolerance when we calculate # the free space in our storage point TOL = 10 * (2**30) @@ -32,7 +32,7 @@ class StoreExecutor(TaskExecutor): def __init__(self): self.type = "store_executor" self.systemUtils = SystemUtils() - config = Config("/etc/vos_ts/vos_ts.conf") + config = Config("/etc/vos_ts/vos_ts.conf") params = config.loadSection("transfer_node") self.storageStorePath = params["store_path"] params = config.loadSection("transfer") @@ -60,7 +60,7 @@ class StoreExecutor(TaskExecutor): 1, 1, self.logger) - params = config.loadSection("spectrum_archive") + params = config.loadSection("spectrum_protect") self.tapeClient = TapeClient(params["host"], params.getint("port"), params["user"],