rda-python-dsarch 1.0.18__tar.gz → 1.0.20__tar.gz

{rda_python_dsarch-1.0.18 → rda_python_dsarch-1.0.20}/PKG-INFO

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

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

{rda_python_dsarch-1.0.18 → rda_python_dsarch-1.0.20}/src/rda_python_dsarch/PgArch.py

@@ -693,6 +693,7 @@ def check_enough_options(cact, acts):
       if 'EM' not in PgOPT.params: PgLOG.PGLOG['LOGMASK'] &= ~PgLOG.EMLALL   # turn off email if not yet
       PgOPT.PGOPT['emerol'] |= PgLOG.EXITLG
       # set command line Batch options
+      set_qsub_walltime()
       PgCMD.set_batch_options(PgOPT.params, 1)
       PgCMD.init_dscheck(0, '', "dsarch", PgOPT.params['DS'], cact, PgLOG.PGLOG['CURDIR'], PgOPT.params['LN'],
                          PgOPT.params['BP'], PgOPT.PGOPT['emerol'])
@@ -700,6 +701,30 @@ def check_enough_options(cact, acts):
 
    PgSIG.start_none_daemon('dsarch', PgOPT.PGOPT['CACT'], PgOPT.params['LN'], 1, PgOPT.params['WI'], 1, PgOPT.params['AL'])
 
+#
+# set qsub walltime if needed
+#
+def set_qsub_walltime():
+
+   fcnt = 0
+   if 'LF' in PgOPT.params:
+      fcnt = len(PgOPT.params['LF'])
+   elif 'WF' in PgOPT.params:
+      fcnt = len(PgOPT.params['WF'])
+   else:
+      return
+
+   if 'GX' in PgOPT.params: fcnt *= 30
+   hr = int(fcnt/30000)
+   if hr == 6: return
+
+   if hr < 2:
+      hr = 2
+   elif hr > 24:
+      hr = 24
+   PgCMD.set_one_boption('qoptions', '-l walltime={}:00:00'.format(hr), 1)
+   return
+
 #
 # build local file list for given local directory and reset file sizes
 #

{rda_python_dsarch-1.0.18 → rda_python_dsarch-1.0.20}/src/rda_python_dsarch/dsarch.py

@@ -2040,7 +2040,7 @@ def restore_backup_savedfiles():
    if 'EM' in PgOPT.params: PgLOG.PGLOG['PRGMSG'] = ""
 
 #
-# cross copy quasar backup files between Globus endpoints rda-quasar and rda-quasar-drdata
+# cross copy quasar backup files between Globus endpoints gdex-quasar and gdex-quasar-drdata
 #
 def crosscopy_backup_files():
 
@@ -2052,8 +2052,8 @@ def crosscopy_backup_files():
    s = 's' if ALLCNT > 1 else ''
    bidx = chksize = 0
    dflags = {}
-   bpoint = 'rda-quasar'
-   dpoint = 'rda-quasar-drdata'
+   bpoint = 'gdex-quasar'
+   dpoint = 'gdex-quasar-drdata'
    PgLOG.pglog("Cross Copy {} Quasar file{} of {} ...".format(ALLCNT, s, dsid), PgLOG.WARNLG)
 
    PgOPT.validate_multiple_values(tname, ALLCNT)
@@ -3326,7 +3326,7 @@ def set_one_backfile(i, pgrec, file, flds, type, ndsid = None, record = None):
          record['dsid'] = dsid
          record['uid'] = PgOPT.PGOPT['UID']
          if 'status' not in record: record['status'] = 'A'
-         info = PgFile.check_backup_file("/{}/{}".format(dsid, file), 'rda-quasar', 1, PgOPT.PGOPT['emerol'])
+         info = PgFile.check_backup_file("/{}/{}".format(dsid, file), 'gdex-quasar', 1, PgOPT.PGOPT['emerol'])
          if info:
             if not info['isfile']: return PgLOG.pglog(file + ": is a directory", PgOPT.PGOPT['emlerr'])
             record['data_size'] = info['data_size']
@@ -4156,8 +4156,8 @@ def move_backup_files():
    tname = 'bfile'
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
-   bkend = "rda-quasar"
-   drend = 'rda-quasar-drdata'
+   bkend = "gdex-quasar"
+   drend = 'gdex-quasar-drdata'
    bidx = chksize = 0
 
    tmpds = None
@@ -4566,8 +4566,8 @@ def delete_backup_files():
    dsid = PgOPT.params['DS']
    dcnd = "dsid = '{}'".format(dsid)
    brec = {'bid' : 0}
-   bkend = "rda-quasar"
-   drend = "rda-quasar-drdata"
+   bkend = "gdex-quasar"
+   drend = "gdex-quasar-drdata"
    s = 's' if ALLCNT > 1 else ''
    PgLOG.pglog("Delete {} Backup file{} from {} ...".format(ALLCNT, s, dsid), PgLOG.WARNLG)
 

{rda_python_dsarch-1.0.18 → rda_python_dsarch-1.0.20}/src/rda_python_dsarch.egg-info/PKG-INFO

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