Loading transfer_service/store_preprocessor.py +1 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ class StorePreprocessor(TaskExecutor): config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_grouper") self.fileGrouper = FileGrouper(self.params.getint("min_num_files"), self.systemUtils.convertSizeToBytes(params["max_dir_size"])) self.systemUtils.convertSizeToBytes(self.params["max_dir_size"])) self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], Loading transfer_service/tape_client.py +4 −4 Original line number Diff line number Diff line Loading @@ -34,7 +34,7 @@ class TapeClient(object): def getTaskList(self): """Returns the whole task list.""" stdin, stdout, stderr = self.client.exec_command("eeadm task list --json") stdin, stdout, stderr = self.client.exec_command(f"{self.EEADM} task list --json") exitCode = stdout.channel.recv_exit_status() if not exitCode: result = json.loads(stdout.readlines()[0].rstrip('\n')) Loading Loading @@ -86,7 +86,7 @@ class TapeClient(object): fp.close() self.copy(f"./{tmp}", f"/tmp/{tmp}") os.remove(f"./{tmp}") cmd = f"{EEADM} migrate /tmp/{tmp} -p pl_generic_rw_01" cmd = f"{self.EEADM} migrate /tmp/{tmp} -p pl_generic_rw_01" stdin, stdout, stderr = self.client.exec_command(cmd) def recall(self, fileList): Loading @@ -101,7 +101,7 @@ class TapeClient(object): fp.close() os.remove(f"./{tmp}") self.copy("./" + tmp, "/tmp/" + tmp) cmd = f"{EEADM} recall /tmp/{tmp}" cmd = f"{self.EEADM} recall /tmp/{tmp}" stdin, stdout, stderr = self.client.exec_command(cmd) def recallChecksumFiles(self, dirName): Loading @@ -109,7 +109,7 @@ class TapeClient(object): Recursively recalls from tape all the checksum files related to the 'dirName' directory. """ cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {EEADM}" cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {self.EEADM}" stdin, stdout, stderr = self.client.exec_command(cmd) exitCode = stdout.channel.recv_exit_status() out = open("tape_client_log.txt", "a") Loading Loading
transfer_service/store_preprocessor.py +1 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ class StorePreprocessor(TaskExecutor): config = Config("/etc/vos_ts/vos_ts.conf") self.params = config.loadSection("file_grouper") self.fileGrouper = FileGrouper(self.params.getint("min_num_files"), self.systemUtils.convertSizeToBytes(params["max_dir_size"])) self.systemUtils.convertSizeToBytes(self.params["max_dir_size"])) self.params = config.loadSection("file_catalog") self.dbConn = DbConnector(self.params["user"], self.params["password"], Loading
transfer_service/tape_client.py +4 −4 Original line number Diff line number Diff line Loading @@ -34,7 +34,7 @@ class TapeClient(object): def getTaskList(self): """Returns the whole task list.""" stdin, stdout, stderr = self.client.exec_command("eeadm task list --json") stdin, stdout, stderr = self.client.exec_command(f"{self.EEADM} task list --json") exitCode = stdout.channel.recv_exit_status() if not exitCode: result = json.loads(stdout.readlines()[0].rstrip('\n')) Loading Loading @@ -86,7 +86,7 @@ class TapeClient(object): fp.close() self.copy(f"./{tmp}", f"/tmp/{tmp}") os.remove(f"./{tmp}") cmd = f"{EEADM} migrate /tmp/{tmp} -p pl_generic_rw_01" cmd = f"{self.EEADM} migrate /tmp/{tmp} -p pl_generic_rw_01" stdin, stdout, stderr = self.client.exec_command(cmd) def recall(self, fileList): Loading @@ -101,7 +101,7 @@ class TapeClient(object): fp.close() os.remove(f"./{tmp}") self.copy("./" + tmp, "/tmp/" + tmp) cmd = f"{EEADM} recall /tmp/{tmp}" cmd = f"{self.EEADM} recall /tmp/{tmp}" stdin, stdout, stderr = self.client.exec_command(cmd) def recallChecksumFiles(self, dirName): Loading @@ -109,7 +109,7 @@ class TapeClient(object): Recursively recalls from tape all the checksum files related to the 'dirName' directory. """ cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {EEADM}" cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) | {self.EEADM}" stdin, stdout, stderr = self.client.exec_command(cmd) exitCode = stdout.channel.recv_exit_status() out = open("tape_client_log.txt", "a") Loading