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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 2.0.2
+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.2 → 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.2"
+version = "2.0.3"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

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

@@ -165,8 +165,8 @@ 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.DSLMTS = {}
@@ -769,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)

{rda_python_dscheck-2.0.2 → 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.2
+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