rda-python-dscheck 2.0.1__tar.gz → 2.0.3__tar.gz

{rda_python_dscheck-2.0.1 → rda_python_dscheck-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 2.0.1
+Version: 2.0.3
 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

{rda_python_dscheck-2.0.1 → rda_python_dscheck-2.0.3}/pyproject.toml

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

{rda_python_dscheck-2.0.1 → rda_python_dscheck-2.0.3}/src/rda_python_dscheck/dscheck.py

@@ -435,7 +435,7 @@ class DsCheck(PgCheck):
           cnd += "specialist = '{}' AND ".format(self.params['LN'])
       acnd = self.get_hash_condition("dscheck", None, "ST", 1)
       if acnd: acnd += " AND "
-      self.set_dscheck_options(self.get_host(1), cnd + acnd, logact)
+      self.set_dscheck_options(cnd + acnd, logact)
       if self.PGLOG['ERRCNT']: self.send_error_email()
 
    # rdadata daemon handles the daemon controls

{rda_python_dscheck-2.0.1 → rda_python_dscheck-2.0.3}/src/rda_python_dscheck/pg_check.py

@@ -165,12 +165,10 @@ class PgCheck(PgOPT, PgCMD):
       self.PGOPT['dscheck']   = "COVTUPFJDNW"            # default
       self.PGOPT['chkall']    = "COVTAUPRBFJKLZDYHNWMIQXE"   # default to all   
       self.PGOPT['dsdaemon']  = "ICHQSPO"                 # default to all
-      self.PGOPT['waitlimit'] = 280      # limit of C and P request checks at a time
-      self.PGOPT['totallimit'] = 380     # maximum number of checks can be started on PBS
+      self.PGOPT['waitlimit'] = 300      # limit of C and P request checks at a time
+      self.PGOPT['totallimit'] = 500     # maximum number of checks can be started on PBS
       self.PBSQUEUES = {'rda': None, 'htc': 'casper@casper-pbs'}
       self.PBSTIMES = {'default': 21600, 'rda': self.PGLOG['PBSTIME'], 'htc': 86400}
-      #self.DOPTHOSTS = {'rda-work': None, 'PBS': ['!subconv -Q']}
-      self.DOPTHOSTS = {'rda-work': None, 'PBS': None, 'cron': None}
       self.DSLMTS = {}
       self.EMLMTS = {}
 
@@ -771,8 +769,8 @@ class PgCheck(PgOPT, PgCMD):
                "einfo IS NULL ORDER BY priority, rindex")
       pgrecs = self.pgmget("dsrqst", "*",  rcnd, logact)
       cnt = (len(pgrecs['rindex']) if pgrecs else 0)
-      ccnt = self.pgget("dscheck", '', "status = 'C'", logact)
-      pcnt = self.pgget("dscheck", '', "status = 'P'", logact)
+      ccnt = self.pgget("dscheck", '', "command = 'dsrqst' AND status = 'C'", logact)
+      pcnt = self.pgget("dscheck", '', "command = 'dsrqst' AND status = 'P'", logact)
       if (ccnt+pcnt) > self.PGOPT['waitlimit']:
          if cnt: self.pglog("{}/{} Checks are Waiting/Pending; Add new dscheck records {} later".format(ccnt, pcnt, self.PGLOG['HOSTNAME']),
                              self.LOGWRN|self.FRCLOG)
@@ -816,15 +814,12 @@ class PgCheck(PgOPT, PgCMD):
       return False
 
    # call given command to evaluate dynamically the dscheck.qoptions
-   def set_dscheck_options(self, chost, cnd, logact):
-      if chost not in self.DOPTHOSTS: return
+   def set_dscheck_options(self, cnd, logact):
       qcnt = 0
-      skipcmds = self.DOPTHOSTS[chost]
       pgrecs = self.pgmget("dscheck", "*", cnd + "pid = 0 AND status = 'C' AND LEFT(qoptions, 1) = '!'", logact)
       cnt = len(pgrecs['cindex']) if pgrecs else 0
       for i in range(cnt):
          pgrec = self.onerecord(pgrecs, i)
-         if skipcmds and pgrec['qoptions'] in skipcmds: continue   # skip
          if self.lock_dscheck(pgrec['cindex'], 1) <= 0: continue
          qoptions = self.build_dscheck_options(pgrec, 'qoptions', 'PBS')
          if not qoptions and pgrec['status'] == 'E': continue  # failed evaluating qoptions

{rda_python_dscheck-2.0.1 → rda_python_dscheck-2.0.3}/src/rda_python_dscheck.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 2.0.1
+Version: 2.0.3
 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