rda-python-dsarch 3.0.9__tar.gz → 3.0.11__tar.gz

{rda_python_dsarch-3.0.9/src/rda_python_dsarch.egg-info → rda_python_dsarch-3.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.9
+Version: 3.0.11
 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.9 → rda_python_dsarch-3.0.11}/pyproject.toml

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

{rda_python_dsarch-3.0.9 → rda_python_dsarch-3.0.11}/src/rda_python_dsarch/dsarch.py

@@ -1710,10 +1710,8 @@ class DsArch(PgArch, PgMeta):
                self.pglog("{}: Backup tar file of Backup Id {} is not downloaded".format(wfile, pgrec['bid']), self.PGOPT['wrnlog'])
                continue
             tarfile = self.TARFILES[pgrec['bid']]
+            self.make_local_directory(tardir, self.PGOPT['extlog'])
             ainfo = self.get_backup_member_file(pgrec, tarfile, tardir)
-            tarcmd = "tar -xvf {} -C {} {}".format(tarfile, tardir, wfile)
-            self.pgsystem(tarcmd, self.PGOPT['extlog'], 5)
-            ainfo = self.check_local_file(afile, 0, self.PGOPT['extlog'])
             if not ainfo:
                self.pglog("{}: Error untar File {}".format(tarfile, afile), self.PGOPT['wrnlog'])
                continue
@@ -1817,10 +1815,8 @@ class DsArch(PgArch, PgMeta):
                self.pglog("{}: Backup tar file of Backup Id {} is not downloaded".format(sfile, pgrec['bid']), self.PGOPT['wrnlog'])
                continue
             tarfile = self.TARFILES[pgrec['bid']]
+            self.make_local_directory(tardir, self.PGOPT['extlog'])
             ainfo = self.get_backup_member_file(pgrec, tarfile, tardir)
-            tarcmd = "tar -xvf {} -C {} {}".format(tarfile, tardir, sfile)
-            self.pgsystem(tarcmd, self.PGOPT['extlog'], 5)
-            ainfo = self.check_local_file(afile, 0, self.PGOPT['extlog'])
             if not ainfo:
                self.pglog("{}: Error untar File {}".format(tarfile, afile), self.PGOPT['wrnlog'])
                continue
@@ -1918,14 +1914,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
@@ -1956,9 +1956,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.9 → rda_python_dsarch-3.0.11/src/rda_python_dsarch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsarch
-Version: 3.0.9
+Version: 3.0.11
 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