rda-python-dscheck 1.0.8__tar.gz → 2.0.0__tar.gz

{rda_python_dscheck-1.0.8 → rda_python_dscheck-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 1.0.8
+Version: 2.0.0
 Summary: RDA python package to add and process batch jobs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dscheck
@@ -12,7 +12,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
-Requires-Dist: rda_python_setuid
 Dynamic: license-file
 
 RDA python package to add and process batch jobs.

{rda_python_dscheck-1.0.8 → rda_python_dscheck-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dscheck"
-version = "1.0.8"
+version = "2.0.0"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -18,18 +18,13 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
 ]
 dependencies = [
-  "rda_python_common",
-  "rda_python_setuid",
+  "rda_python_common"
 ]
 
-[tool.setuptools]
-include-package-data = true
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-"rda_python_dscheck" = ["dscheck.usg"]
+[tool.pytest.ini_options]
+pythonpath = [
+  "src"
+]
 
 [project.urls]
 "Homepage" = "https://github.com/NCAR/rda-python-dscheck"

{rda_python_dscheck-1.0.8 → rda_python_dscheck-2.0.0}/src/rda_python_dscheck/PgCheck.py

@@ -211,7 +211,7 @@ def check_dscheck_options(cact, aname):
       "Miss check index per Info option -CI(-CheckIndex)",
       "Need Machine Hostname per -HN for new daemon control",
       "Need Application command name per -CM for new daemon control",
-      "Must be {} to process Checks in daemon mode".format(PgLOG.PGLOG['RDAUSER']),
+      "Must be {} to process Checks in daemon mode".format(PgLOG.PGLOG['GDEXUSER']),
       "Miss Command information per Info option -CM(-Command)",
    ]
    erridx = -1
@@ -223,7 +223,7 @@ def check_dscheck_options(cact, aname):
    if 'DM' in PgOPT.params:
       if cact != "PC":
          erridx = 0
-      elif PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['RDAUSER']:
+      elif PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['GDEXUSER']:
          erridx = 5
       elif 'CI' in PgOPT.params:
          erridx = 1
@@ -280,7 +280,7 @@ def check_dscheck_options(cact, aname):
       wtime = PgOPT.params['WI'] if 'WI' in PgOPT.params else 30
       logon = PgOPT.params['LO'] if 'LO' in PgOPT.params else 1
       PgSIG.start_none_daemon(aname, cact, PgOPT.params['LN'], 1, wtime, logon)
-      if not ('CI' in PgOPT.params or 'DS' in PgOPT.params or PgOPT.params['LN'] == PgLOG.PGLOG['RDAUSER']):
+      if not ('CI' in PgOPT.params or 'DS' in PgOPT.params or PgOPT.params['LN'] == PgLOG.PGLOG['GDEXUSER']):
          PgOPT.set_default_value("SN", PgOPT.params['LN'])
 
    # minimal wait interval in seconds for next check
@@ -509,8 +509,7 @@ def dscheck_runtime(start, end = None):
 #
 def purge_dschecks(cnd, logact = 0):
 
-   cnd += "pid = 0 AND einfo IS NULL AND bid "
-   cnd += ('> 0' if CHKHOST['curhost'] == PgLOG.PGLOG['PGBATCH'] else '= 0')
+   cnd += "pid = 0 AND einfo IS NULL"
    pgrecs = PgDBI.pgmget("dscheck", "*", cnd, logact)
    cnt = (len(pgrecs['cindex']) if pgrecs else 0)
    ctime = int(time.time()) - PgSIG.PGSIG['CTIME']
@@ -582,7 +581,7 @@ def start_one_dscheck(pgrec, logact = 0):
 
    lidx = get_process_host(limits, pgrec['hostname'], pgrec['command'], pgrec['action'], logact)
    if lidx < 0 or skip_dscheck_record(pgrec, host, logact): return 0
-   cmd = "pgstart_{} ".format(specialist) if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['RDAUSER'] else ""
+   cmd = "pgstart_{} ".format(specialist) if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['GDEXUSER'] else ""
    if not PgUtil.pgcmp(host, PgLOG.PGLOG['PBSNAME'], 1):
       if reach_dataset_limit(pgrec): return 0
       cmd += get_specialist_shell(specialist) + 'qsub '
@@ -1533,7 +1532,7 @@ def validate_daemons():
          if not pgrec:
             PgOPT.action_error("Daemon Control Index '{}' is not in RDADB".format(val))
          elif(PgOPT.OPTS[PgOPT.PGOPT['CACT']][2] > 0 and PgOPT.params['LN'] != pgrec['specialist'] and
-              PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['RDAUSER']):
+              PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['GDEXUSER']):
             PgOPT.action_error("{}: must be {}, owner of Daemon Control Index {}".format(PgOPT.params['LN'], pgrec['specialist'], val))
    else: # found none-equal condition sign
       pgrec = PgDBI.pgmget("dsdaemon", "DISTINCT dindex",
@@ -1574,7 +1573,7 @@ def validate_checks():
             if not pgrec:
                PgOPT.action_error("Check Index '{}' is not in RDADB".format(val))
             elif(PgOPT.OPTS[PgOPT.PGOPT['CACT']][2] > 0 and PgOPT.params['LN'] != pgrec['specialist'] and
-                 PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['RDAUSER']):
+                 PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['GDEXUSER']):
                PgOPT.action_error("{}: must be {}, owner of Check Index {}".format(PgOPT.params['LN'], pgrec['specialist'], val))
       else: # found none-equal condition sign
          pgrec = PgDBI.pgmget("dscheck", "cindex", PgDBI.get_field_condition("cindex", PgOPT.params['CI'], 0, 1), PgOPT.PGOPT['extlog'])

rda_python_dscheck-1.0.8/src/rda_python_dscheck/dscheck.py → rda_python_dscheck-2.0.0/src/rda_python_dscheck/ds_check.py

@@ -279,7 +279,7 @@ def set_daemon_info():
          if pgrec:
             modcnt += PgDBI.pgupdt(tname, record, cnd, PgOPT.PGOPT['extlog'])
          else:
-            if 'specialist' not in record and PgOPT.params['LN'] != PgLOG.PGLOG['RDAUSER']: record['specialist'] = PgOPT.params['LN']
+            if 'specialist' not in record and PgOPT.params['LN'] != PgLOG.PGLOG['GDEXUSER']: record['specialist'] = PgOPT.params['LN']
             didx = PgDBI.pgadd(tname, record, PgOPT.PGOPT['extlog']|PgLOG.AUTOID)
             if didx:
                PgLOG.pglog("Daemon Control Index {} added".format(didx), PgOPT.PGOPT['wrnlog'])
@@ -506,12 +506,12 @@ def process_dschecks():
 
    logact = PgLOG.LOGERR
 
-   if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['RDAUSER'] and (time.time()%(3*PgSIG.PGSIG['CTIME'])) < 60:
+   if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['GDEXUSER'] and (time.time()%(3*PgSIG.PGSIG['CTIME'])) < 60:
       logact |= PgLOG.EMEROL
 
    cnd = PgOPT.get_hash_condition("dscheck", "ST", None, 1)
    if cnd: cnd += " AND "
-   if 'SN' not in PgOPT.params and PgOPT.params['LN'] != PgLOG.PGLOG['RDAUSER']:
+   if 'SN' not in PgOPT.params and PgOPT.params['LN'] != PgLOG.PGLOG['GDEXUSER']:
        cnd += "specialist = '{}' AND ".format(PgOPT.params['LN'])
 
    if 'WR' in PgOPT.params: PgCheck.start_dsrqsts(cnd, logact)
@@ -530,12 +530,12 @@ def process_dscheck_options():
 
    logact = PgLOG.LOGERR
 
-   if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['RDAUSER'] and (time.time()%(3*PgSIG.PGSIG['CTIME'])) < 60:
+   if PgLOG.PGLOG['CURUID'] == PgLOG.PGLOG['GDEXUSER'] and (time.time()%(3*PgSIG.PGSIG['CTIME'])) < 60:
       logact |= PgLOG.EMEROL
 
    cnd = PgOPT.get_hash_condition("dscheck", "ST", None, 1)
    if cnd: cnd += " AND "
-   if 'SN' not in PgOPT.params and PgOPT.params['LN'] != PgLOG.PGLOG['RDAUSER']:
+   if 'SN' not in PgOPT.params and PgOPT.params['LN'] != PgLOG.PGLOG['GDEXUSER']:
        cnd += "specialist = '{}' AND ".format(PgOPT.params['LN'])
 
    acnd = PgOPT.get_hash_condition("dscheck", None, "ST", 1)
@@ -654,7 +654,7 @@ def check_host_connection():
       hostname = pgrecs['hostname'][i]
       cmd = "ssh {} ps".format(hostname)
       if specialist != PgLOG.PGLOG['CURUID']:
-         if PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['RDAUSER']:
+         if PgLOG.PGLOG['CURUID'] != PgLOG.PGLOG['GDEXUSER']:
             PgLOG.pglog("{}: Cannot check connection to '{}' for {}".format(PgLOG.PGLOG['CURUID'], hostname, specialist), PgLOG.LOGERR)
             continue
          else: