Skip to content

Hua work common #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaihuaji merged 2 commits into from
Sep 4, 2025
Merged

Hua work common #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d78cc11
rda-glade to gdex-glade
Sep 4, 2025
367998a
rda-quasar => gdex-quasar
Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "rda_python_common"
version = "1.0.35"
version = "1.0.36"
authors = [
{ name="Zaihua Ji", email="zji@ucar.edu" },
]
Expand Down
30 changes: 15 additions & 15 deletions src/rda_python_common/PgFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Purpose : python library module to copy, move and delete data files locally
# and remotely
#
# Github : https://github.com/NCAR/rda-python_common.git
# Github : https://github.com/NCAR/rda-python-common.git
#
###############################################################################
#
Expand Down Expand Up @@ -101,21 +101,21 @@
}

QPOINTS = {
'L' : 'rda-glade',
'B' : 'rda-quasar',
'D' : 'rda-quasar-drdata'
'L' : 'gdex-glade',
'B' : 'gdex-quasar',
'D' : 'gdex-quasar-drdata'
}

QHOSTS = {
'rda-glade' : LHOST,
'rda-quasar' : BHOST,
'rda-quasar-drdata' : DHOST
'gdex-glade' : LHOST,
'gdex-quasar' : BHOST,
'gdex-quasar-drdata' : DHOST
}

ENDPOINTS = {
'rda-glade' : "NCAR RDA GLADE",
'rda-quasar' : "NCAR RDA Quasar",
'rda-quasar-drdata' : "NCAR RDA Quasar DRDATA"
'gdex-glade' : "NCAR RDA GLADE",
'gdex-quasar' : "NCAR RDA Quasar",
'gdex-quasar-drdata' : "NCAR RDA Quasar DRDATA"
}

BFILES = {} # cache backup file names and dates for each bid
Expand Down Expand Up @@ -332,7 +332,7 @@ def local_copy_object(tofile, fromfile, bucket = None, meta = None, logact = 0):
# tofiles - target file name list, echo name leading with /dsnnn.n/ on Quasar and
# leading with /data/ or /decsdata/ on local glade disk
# fromfiles - source file name list, the same format as the tofiles
# topoint - target endpoint name, 'rda-glade', 'rda-quasar' or 'rda-quasar-drdata'
# topoint - target endpoint name, 'gdex-glade', 'gdex-quasar' or 'gdex-quasar-drdata'
# frompoint - source endpoint name, the same choices as the topoint
#
def quasar_multiple_trasnfer(tofiles, fromfiles, topoint, frompoint, logact = 0):
Expand Down Expand Up @@ -374,7 +374,7 @@ def quasar_multiple_trasnfer(tofiles, fromfiles, topoint, frompoint, logact = 0)
# tofile - target file name, leading with /dsnnn.n/ on Quasar and
# leading with /data/ or /decsdata/ on local glade disk
# fromfile - source file, the same format as the tofile
# topoint - target endpoint name, 'rda-glade', 'rda-quasar' or 'rda-quasar-drdata'
# topoint - target endpoint name, 'gdex-glade', 'gdex-quasar' or 'gdex-quasar-drdata'
# frompoint - source endpoint name, the same choices as the topoint
#
def endpoint_copy_endpoint(tofile, fromfile, topoint, frompoint, logact = 0):
Expand Down Expand Up @@ -532,7 +532,7 @@ def check_globus_finished(tofile, topoint, logact = 0):
def local_copy_backup(tofile, fromfile, endpoint = None, logact = 0):

if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
return endpoint_copy_endpoint(tofile, fromfile, endpoint, 'rda-glade', logact)
return endpoint_copy_endpoint(tofile, fromfile, endpoint, 'gdex-glade', logact)

#
# Copy a Quasar backup file to local Globus endpoint
Expand All @@ -544,7 +544,7 @@ def local_copy_backup(tofile, fromfile, endpoint = None, logact = 0):
def backup_copy_local(tofile, fromfile, endpoint = None, logact = 0):

if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
return endpoint_copy_endpoint(tofile, fromfile, 'rda-glade', endpoint, logact)
return endpoint_copy_endpoint(tofile, fromfile, 'gdex-glade', endpoint, logact)

#
# Copy a remote file to local
Expand Down Expand Up @@ -1577,7 +1577,7 @@ def check_rda_file(file, host = LHOST, opt = 0, logact = 0):
def check_globus_file(file, endpoint = None, opt = 0, logact = 0):

if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
if endpoint == 'rda-glade':
if endpoint == 'gdex-glade':
if re.match(r'^/(data|decsdata)/', file): file = PgLOG.PGLOG['DSSDATA'] + file
return check_local_file(file, opt, logact)
else:
Expand Down
4 changes: 2 additions & 2 deletions src/rda_python_common/PgLOG.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,8 +1315,8 @@ def set_common_pglog():
SETPGLOG("DBGLEVEL", '') # debug level
SETPGLOG("DBGPATH", PGLOG['DSSDBHM']+"/log") # path to debug log file
SETPGLOG("OBJCTBKT", "rda-data") # default Bucket on Object Store
SETPGLOG("BACKUPEP", "rda-quasar") # default Globus Endpoint on Quasar
SETPGLOG("DRDATAEP", "rda-quasar-drdata") # DRDATA Globus Endpoint on Quasar
SETPGLOG("BACKUPEP", "gdex-quasar") # default Globus Endpoint on Quasar
SETPGLOG("DRDATAEP", "gdex-quasar-drdata") # DRDATA Globus Endpoint on Quasar
SETPGLOG("DBGFILE", "pgdss.dbg") # debug file name
SETPGLOG("CNFPATH", PGLOG['DSSHOME']+"/config") # path to configuration files
SETPGLOG("DSSURL", "https://rda.ucar.edu") # current dss web URL
Expand Down