Address comments

Author: forsyth2

zstash/create.py

@@ -99,9 +99,9 @@ def create():
         hpss,
         get_db_filename(cache),
         cache,
+        transfer_manager,
         keep=args.keep,
         is_index=True,
-        transfer_manager=transfer_manager,
     )
 
     logger.debug(f"{ts_utc()}: calling globus_finalize()")
@@ -292,9 +292,9 @@ def create_database(
         args.keep,
         args.follow_symlinks,
         dev_options,
+        transfer_manager,
         skip_tars_table=args.no_tars_md5,
         non_blocking=args.non_blocking,
-        transfer_manager=transfer_manager,
     )
 
     # Close database

zstash/globus.py

@@ -207,7 +207,7 @@ def globus_transfer(  # noqa: C901
                 # Note: any status we manually set
                 # (I.e., "UNKNOWN", "SUBMITTED", "EXHAUSTED_TIMEOUT_RETRIES") is NOT possible here,
                 # because we're using `task["status"]` from the globus_sdk TransferClient.
-                logger.error(
+                logger.warning(
                     f"{ts_utc()}: Previous task_id {mrb.task_id} status = {mrb.task_status}."
                 )
 

zstash/hpss.py

@@ -150,10 +150,10 @@ def hpss_put(
     hpss: str,
     file_path: str,
     cache: str,
+    transfer_manager: TransferManager,
     keep: bool = True,
     non_blocking: bool = False,
     is_index=False,
-    transfer_manager: Optional[TransferManager] = None,
 ):
     """
     Put a file to the HPSS archive.

zstash/hpss_utils.py

@@ -108,7 +108,7 @@ def process_tar(
         cache: str,
         keep: bool,
         non_blocking: bool,
-        transfer_manager: Optional[TransferManager],
+        transfer_manager: TransferManager,
         skip_tars_table: bool,
         cur: sqlite3.Cursor,
         con: sqlite3.Connection,
@@ -140,10 +140,10 @@ def process_tar(
             hpss,
             os.path.join(cache, self.tfname),
             cache,
+            transfer_manager,
             keep,
             non_blocking,
             is_index=False,
-            transfer_manager=transfer_manager,
         )
         logger.info(
             f"{ts_utc()}: SURFACE (process_tar): Called hpss_put to dispatch archive file {self.tfname}"
@@ -344,9 +344,9 @@ def construct_tars(
     keep: bool,
     follow_symlinks: bool,
     dev_options: DevOptions,
+    transfer_manager: TransferManager,
     skip_tars_table: bool = False,
     non_blocking: bool = False,
-    transfer_manager: Optional[TransferManager] = None,
 ) -> List[str]:
 
     failures: List[str] = []

zstash/update.py

@@ -40,9 +40,9 @@ def update():
         hpss,
         get_db_filename(cache),
         cache,
+        transfer_manager,
         keep=args.keep,
         is_index=True,
-        transfer_manager=transfer_manager,
     )
 
     globus_finalize(transfer_manager, args.keep)
@@ -290,8 +290,8 @@ def update_database(  # noqa: C901
         keep,
         args.follow_symlinks,
         dev_options,
+        transfer_manager,
         non_blocking=args.non_blocking,
-        transfer_manager=transfer_manager,
     )
 
     # Close database