rda-python-dsquasar 3.0.16__tar.gz → 3.0.18__tar.gz

{rda_python_dsquasar-3.0.16/src/rda_python_dsquasar.egg-info → rda_python_dsquasar-3.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 3.0.16
+Version: 3.0.18
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar

{rda_python_dsquasar-3.0.16 → rda_python_dsquasar-3.0.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsquasar"
-version = "3.0.16"
+version = "3.0.18"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dsquasar-3.0.16 → rda_python_dsquasar-3.0.18}/src/rda_python_dsquasar/dsquasar.py

@@ -1071,8 +1071,9 @@ class DsQuasar(PgCMD, PgSplit):
             if not dstat: self.pglog("Error Quaser Drdata for " + fmsg, self.ERRACT|self.LOGERR)
          bstat = self.quasar_multiple_transfer(tofiles, fromfiles, 'gdex-quasar', 'gdex-glade', self.ERRACT)
          if not bstat: self.pglog("Error Quaser Backup for " + fmsg, self.ERRACT|self.LOGERR)
-         if dstat == self.FINISH: dstat = self.check_globus_finished(tofiles[0], 'gdex-quasar-drdata', self.ERRACT|self.NOWAIT)
-         if bstat == self.FINISH: bstat = self.check_globus_finished(tofiles[0], 'gdex-quasar', self.ERRACT|self.NOWAIT)
+         tcnt = len(tofiles)
+         if dstat == self.FINISH: dstat = self.check_globus_finished(tofiles[0], 'gdex-quasar-drdata', self.ERRACT|self.NOWAIT, tcnt)
+         if bstat == self.FINISH: bstat = self.check_globus_finished(tofiles[0], 'gdex-quasar', self.ERRACT|self.NOWAIT, tcnt)
          if dstat and bstat:
             for fromfile in fromfiles:
                tarfile = self.PGLOG['DSSDATA'] + fromfile
@@ -1408,7 +1409,11 @@ class DsQuasar(PgCMD, PgSplit):
          # them before any work, and -A 3 does a third one before tarring
          self.check_batch_deadline()
          dsid = pgrec['dsid']
-         if unlock and pgrec['pid'] and self.lock_dataset(dsid, 0, self.LOGACT) < 1: continue
+         # a changed-file run takes records that are already backed up (bid > 0) while the
+         # main runs take new files (bid = 0), so it shares no record with the worker holding
+         # the lock and must not skip the dataset for it
+         if unlock and pgrec['pid'] and not self.PGBACK['chgdays']:
+            if self.lock_dataset(dsid, 0, self.LOGACT) < 1: continue
          fcnt += self.get_dataset_files(dsid, dsfiles, pgrec['backflag'], logact, sizes)
       if dsfiles:
          s = 's' if fcnt > 1 else ''

{rda_python_dsquasar-3.0.16 → rda_python_dsquasar-3.0.18/src/rda_python_dsquasar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 3.0.16
+Version: 3.0.18
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar