rda-python-dsarch 3.0.10__tar.gz → 3.0.12__tar.gz

{rda_python_dsarch-3.0.10/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.10
+Version: 3.0.12
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

{rda_python_dsarch-3.0.10 → rda_python_dsarch-3.0.12}/pyproject.toml

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

{rda_python_dsarch-3.0.10 → rda_python_dsarch-3.0.12}/src/rda_python_dsarch/dsarch.py

@@ -1802,7 +1802,8 @@ class DsArch(PgArch, PgMeta):
             oarch = 0
          ofile = (self.join_paths(dsid, sfile) if oarch else None)
          if sarch:
-            tardir = "{}/{}".format(self.PGLOG['DECSHOME'], dsid)
+            # saved files are tarred relative to DECSHOME/<dsid>/<type>, per tar_backup_savedfiles()
+            tardir = "{}/{}/{}".format(self.PGLOG['DECSHOME'], dsid, type)
          else:
             tardir = "{}/{}/{}".format(self.PGLOG['DECSHOME'], self.PGLOG['BACKUPEP'], dsid)
          afile = "{}/{}".format(tardir, sfile)
@@ -1914,14 +1915,18 @@ class DsArch(PgArch, PgMeta):
                self.pglog(binfo + ": No need Cross Copy, Both Backup & Drdata Exist", self.PGOPT['wrnlog'])
                continue
             if barch:
-               if not self.endpoint_copy_endpoint(qfile, qfile, bpoint, dpoint, self.PGOPT['emerol']|self.OVERRIDE):
+               bstat = self.endpoint_copy_endpoint(qfile, qfile, bpoint, dpoint, self.PGOPT['emerol']|self.OVERRIDE)
+               if bstat == self.FINISH: bstat = self.check_globus_finished(qfile, bpoint, self.PGOPT['emerol']|self.NOWAIT)
+               if not bstat:
                   errcnt += 1
                   efiles[i] = 1
                   dflags['B'] = bpoint
                   continue
                bcnt += 1
             elif darch:
-               if not self.endpoint_copy_endpoint(qfile, qfile, dpoint, bpoint, self.PGOPT['emerol']|self.OVERRIDE):
+               dstat = self.endpoint_copy_endpoint(qfile, qfile, dpoint, bpoint, self.PGOPT['emerol']|self.OVERRIDE)
+               if dstat == self.FINISH: dstat = self.check_globus_finished(qfile, dpoint, self.PGOPT['emerol']|self.NOWAIT)
+               if not dstat:
                   errcnt += 1
                   efiles[i] = 1
                   dflags['D'] = dpoint
@@ -1952,9 +1957,9 @@ class DsArch(PgArch, PgMeta):
          self.check_background(None, 0, self.LOGWRN, 1)
          for i in range(self.ALLCNT):
             if barchs[i]:
-               self.validate_backarch(qfiles[i], "{}-{}".format(bpoint, qfiles[i]), i)
+               self.validate_backarch(qfiles[i], "{}-{}".format(dpoint, qfiles[i]), bpoint, i)
             elif qfiles[i]:
-               self.validate_backarch(qfiles[i], "{}-{}".format(dpoint, qfiles[i]), i)
+               self.validate_backarch(qfiles[i], "{}-{}".format(bpoint, qfiles[i]), dpoint, i)
       if bcnt > 0: self.pglog("{} of {} Backup file{} Cross Copied for {}".format(bcnt, self.ALLCNT, s, dsid), self.PGOPT['emllog'])
       if dcnt > 0: self.pglog("{} of {} Drdata file{} Cross Copied for {}".format(dcnt, self.ALLCNT, s, dsid), self.PGOPT['emllog'])
       if self.PGLOG['DSCHECK']:

{rda_python_dsarch-3.0.10 → rda_python_dsarch-3.0.12/src/rda_python_dsarch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.10
+Version: 3.0.12
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch