rda-python-common 3.0.18__py3-none-any.whl → 3.0.19__py3-none-any.whl

rda_python_common/__init__.py

@@ -22,7 +22,7 @@ object that existing callers expect.
 
 from . import PgLOG, PgUtil, PgDBI, PgFile, PgLock, PgCMD, PgSIG, PgOPT, PgSplit
 
-__version__ = "3.0.18"
+__version__ = "3.0.19"
 
 __all__ = [
    "PgLOG",

rda_python_common/pg_cmd.py

@@ -207,6 +207,14 @@ class PgCMD(PgLock):
             self.pglog(cmsg + "is Running, No restart", self.LOGWRN)
             sys.exit(0)
          if cidx > 0:
+            # a report parked in einfo by the previous run is only mailed by the dscheck
+            # daemon, which skips any record that is already running. restarting the record
+            # here would strand that report until the next run overwrites it, so leave the
+            # record alone and let the daemon mail it first - it clears einfo when it does
+            if pgrec['einfo']:
+               self.pglog(cmsg + "has a report to email, No restart", self.LOGWRN)
+               self.lock_dscheck(cidx, 0, logact)
+               sys.exit(0)
             if not hosts and pgrec['hostname']:
                hosts = pgrec['hostname']
                self.set_one_boption('hostname', hosts, 0)

rda_python_common/pg_file.py

@@ -105,7 +105,8 @@ class PgFile(PgUtil, PgSIG):
       }
       self.TARSTR = '|'.join(self.PGTARS)
       self.DELDIRS = {}
-      self.TASKIDS = {}   # cache unfinished 
+      self.TASKIDS = {}   # cache unfinished
+      self.QCANCEL = {}   # taskid -> why a task got cancelled, reported by the waiting caller
       self.LHOST = "localhost"
       self.OHOST = self.PGLOG['OBJCTSTR']
       self.BHOST = self.PGLOG['BACKUPNM']
@@ -532,7 +533,11 @@ class PgFile(PgUtil, PgSIG):
                   time.sleep(self.PGSIG['ETIME'])
                   lp += 1
                if task['stat'] == 'S' or task['stat'] == 'A': break
-               if task['stat'] == 'F' and not syserr: break
+               if task['stat'] == 'F' and not syserr:
+                  # nothing waits on this task, so report the cancellation here instead
+                  if task['id'] in self.QCANCEL:
+                     self.errlog("{}: Cancel Task due to {}".format(task['id'], self.QCANCEL.pop(task['id'])), 'B', 1, logact)
+                  break
          errmsg = "Error Execute: " + cmd
          if qstr: errmsg += " with stdin:\n" + qstr
          if syserr:
@@ -581,8 +586,16 @@ class PgFile(PgUtil, PgSIG):
                      detail = ms.group(1)
                      if detail not in astats:
                         if logact&self.NOWAIT:
-                           errmsg = "{}: Cancel Task due to {}:\n{}".format(taskid, detail, buf)
-                           self.errlog(errmsg, 'B', 1, logact)
+                           # record why, and let the caller waiting on this task report it as a
+                           # single error naming the file; dumping the whole get-task output here
+                           # doubled every failure into two error entries, the first 17 lines long
+                           reason = detail
+                           ms = re.search(r'Bytes Transferred:\s+(\d+)', buf)
+                           if ms: reason += " after " + self.format_float_value(ms.group(1))
+                           ms = re.search(r'Files:\s+(\d+)', buf)
+                           if ms: reason += " of {} file(s)".format(ms.group(1))
+                           self.QCANCEL[taskid] = reason
+                           self.pglog("{}: Cancel Task due to {}".format(taskid, reason), self.LOGWRN)
                            ccmd = f"{bcmd} cancel-task {taskid}"
                            self.pgsystem(ccmd, logact, 7)
                         else:
@@ -640,7 +653,10 @@ class PgFile(PgUtil, PgSIG):
                del self.TASKIDS[ckey]
             else:
                status = self.QSTATS[stat] if stat in self.QSTATS else 'UNKNOWN'
-               self.errlog("{}: Status '{}' for Task {}".format(ckey, status, taskid), 'B', 1, logact)
+               errmsg = "{}: Status '{}' for Task {}".format(ckey, status, taskid)
+               if taskid in self.QCANCEL:
+                  errmsg += " - " + self.QCANCEL.pop(taskid)
+               self.errlog(errmsg, 'B', 1, logact)
                ret = self.FAILURE
             break
       return ret

{rda_python_common-3.0.18.dist-info → rda_python_common-3.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.18
+Version: 3.0.19
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.18`).  If the import
+You should see the installed version (currently `3.0.19`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.18.dist-info → rda_python_common-3.0.19.dist-info}/RECORD

@@ -7,10 +7,10 @@ rda_python_common/PgOPT.py,sha256=0nQPF19N-1VWwrjFHEeruVSwVDwvFKd4uowPc8dK7e4,56
 rda_python_common/PgSIG.py,sha256=0MJPH0fTtSshIsvUXkzQjReHPyCWdzHYOY5LbFSh7-A,34318
 rda_python_common/PgSplit.py,sha256=En7xcdkE4YNRcMX88qXnrUgUOnQU3Kqh8uxRIdlJhEA,9156
 rda_python_common/PgUtil.py,sha256=7hXAznAI8tYh-nJRKBIXejNe2ROQ2Wxn28OAndeg0Iw,48433
-rda_python_common/__init__.py,sha256=RnBj2y9ieviHHwkUJ6ayCqCa2pkhjnf3IuTr0CbAFgo,995
-rda_python_common/pg_cmd.py,sha256=PiQaAeb7l92LceqMwSzLpz9nD5pDRHJcEZxTDn-HeCs,33255
+rda_python_common/__init__.py,sha256=jidxhZMM_M89QglpwcOZYTxyUTXwqL_ZGt3nbSREt5o,995
+rda_python_common/pg_cmd.py,sha256=MYldUuM8mSUIT34yKQyUd0i4NL4zdSB8C6Jcc28NRxA,33809
 rda_python_common/pg_dbi.py,sha256=h1snZ8fJwHeBQJmNjsjJoDKkfT4FW9avMvdHgcIc-cA,122328
-rda_python_common/pg_file.py,sha256=3cnaY4wS9t8D4Rcv5_QfHmB9JkNwNGgnKj-KNDff6sc,167089
+rda_python_common/pg_file.py,sha256=IzWNhWloqX2iKYibUhcQNOJsrzkkgiDBrhNrFhd4DdI,168253
 rda_python_common/pg_lock.py,sha256=31EaVDjCkcx3-n8-KnzG18R8Pz7Z6KyFsEqcml6Iq5c,32702
 rda_python_common/pg_log.py,sha256=fN6dcAlcd6nHf21r_CfraCAMgwkrqrDCMSdMtXUa62A,82686
 rda_python_common/pg_opt.py,sha256=LxVAf47wi2STkVGSXMvV3IZphEJcoO8bvYXy6kQ5ox4,82403
@@ -20,9 +20,9 @@ rda_python_common/pg_split.py,sha256=aAWKUZPmZ-LQ_fJ3DSKzPKxJw0fMDJ2fgP8ZT629M30
 rda_python_common/pg_util.py,sha256=JL9NoW-VoQvsjXsUr09oBUWYJJNltU4GyQIfWlpkf90,86084
 rda_python_common/pgpassword.py,sha256=aTQaO59QokWrv2EKom4TvKhNW2Mr6aFMMBVG4DCbcKI,5023
 rda_python_common/pgpassword.usg,sha256=Wrle6A8sdlMGx3ZEAmE6TNDPOlG84Whe0T3rCNFzPfY,2013
-rda_python_common-3.0.18.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-3.0.18.dist-info/METADATA,sha256=3QrHnixrdNIgkpmFIHckhAUU-yF13XU34C3U6Aq0VG0,14530
-rda_python_common-3.0.18.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-rda_python_common-3.0.18.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
-rda_python_common-3.0.18.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-3.0.18.dist-info/RECORD,,
+rda_python_common-3.0.19.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-3.0.19.dist-info/METADATA,sha256=SW-mapQDupPHDBgrKls6HjtoYRxXRU5XM0ZLti-V5bo,14530
+rda_python_common-3.0.19.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+rda_python_common-3.0.19.dist-info/entry_points.txt,sha256=pZgVNWspcK-F1TbPav7C3C9NdeHDZMm_25fW9weix00,65
+rda_python_common-3.0.19.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-3.0.19.dist-info/RECORD,,