Skip to content

do not check PBS processes too frequent #4

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 1 commit into from
Aug 27, 2025
Merged

do not check PBS processes too frequent #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_dscheck"
version = "1.0.4"
version = "1.0.5"
authors = [
{ name="Zaihua Ji", email="[email protected]" },
]
Expand Down
33 changes: 11 additions & 22 deletions src/rda_python_dscheck/PgCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ def start_dschecks(cnd, logact = 0):
if not CHKHOST['chkhost']: email_dschecks(cnd, logact)
purge_dschecks(cnd, logact)

if 'NC' in PgOPT.params or not CHKHOST['chkhost']: return 0
# if 'NC' in PgOPT.params or not CHKHOST['chkhost']: return 0
if 'NC' in PgOPT.params: return 0
if CHKHOST['isbatch'] and 'CP' in PgOPT.params: check_dscheck_pends(cnd, logact)
# set_dscheck_options(CHKHOST['chkhost'], cnd, logact)
reset_process_limits()
Expand Down Expand Up @@ -406,10 +407,7 @@ def check_dscheck_locks(cnd, logact = 0):
dtime = ltime - PgSIG.PGSIG['DTIME']
ctime = ltime - PgSIG.PGSIG['CTIME']
rtime = ltime - PgSIG.PGSIG['RTIME']
if CHKHOST['chkhost']:
cnd += "lockhost {} AND (stttime = 0 OR chktime < {})".format(CHKHOST['hostcond'], dtime)
else:
cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)

pgrecs = PgDBI.pgmget("dscheck", "*", cnd, logact)
cnt = (len(pgrecs['cindex']) if pgrecs else 0)
Expand Down Expand Up @@ -941,8 +939,8 @@ def skip_dscheck_record(pgrec, host, logact = 0):
def start_dsrqsts(cnd, logact = 0):

check_dsrqst_locks(cnd, logact)
if CHKHOST['chkhost']: return 1
email_dsrqsts(cnd, logact)
# if CHKHOST['chkhost']: return 1
if not CHKHOST['chkhost']: email_dsrqsts(cnd, logact)
purge_dsrqsts(cnd, logact)
rcnd = cnd
rcnd += ("status = 'Q' AND rqsttype <> 'C' AND (pid = 0 OR pid < ptcount) AND " +
Expand Down Expand Up @@ -1114,10 +1112,7 @@ def check_dsrqst_locks(cnd, logact = 0):
dtime = ltime - PgSIG.PGSIG['DTIME']
ctime = ltime - PgSIG.PGSIG['CTIME']
rtime = ltime - PgSIG.PGSIG['RTIME']
if CHKHOST['chkhost']:
cnd += "lockhost {} AND locktime < {}".format(CHKHOST['hostcond'], dtime)
else:
cnd += "locktime > 0 AND (locktime < {} OR locktime < {} AND lockhost = '{}' OR locktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
cnd += "locktime > 0 AND (locktime < {} OR locktime < {} AND lockhost = '{}' OR locktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
check_partition_locks(cnd, ltime, logact) # check partitions first

pgrecs = PgDBI.pgmget("dsrqst", "rindex, lockhost, pid, locktime", cnd, logact)
Expand Down Expand Up @@ -1259,9 +1254,9 @@ def start_dsupdts(cnd, logact = 0):

ctime = PgUtil.curtime(1)
check_dsupdt_locks(cnd, logact)
if CHKHOST['chkhost']: return 0
email_dsupdt_controls(cnd, logact)
email_dsupdts(cnd, logact)
if not CHKHOST['chkhost']:
email_dsupdt_controls(cnd, logact)
email_dsupdts(cnd, logact)

cnd += "pid = 0 and cntltime <= '{}' and action > '' AND einfo IS NULL ORDER by cntltime".format(ctime)
pgrecs = PgDBI.pgmget("dcupdt", "*", cnd, logact)
Expand Down Expand Up @@ -1325,10 +1320,7 @@ def check_dsupdt_locks(ocnd, logact = 0):
cnd = ocnd + "pid > 0 AND "
ctime = ltime - 4*PgSIG.PGSIG['CTIME']
rtime = ltime - PgSIG.PGSIG['RTIME']
if CHKHOST['chkhost']:
cnd += "lockhost {} AND chktime < {}".format(CHKHOST['hostcond'], dtime)
else:
cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)

pgrecs = PgDBI.pgmget("dcupdt", "cindex, lockhost, pid, chktime", cnd, logact)
cnt = (len(pgrecs['cindex']) if pgrecs else 0)
Expand Down Expand Up @@ -1359,10 +1351,7 @@ def check_dsupdt_locks(ocnd, logact = 0):
if cnt > 1: PgLOG.pglog("{} of {} DSUPDT Controls unlocked on {}".format(lcnt, cnt, PgLOG.PGLOG['HOSTNAME']), PgLOG.WARNLG)

cnd = ocnd + "pid > 0 AND locktime > 0 AND "
if CHKHOST['chkhost']:
cnd += "hostname {} AND locktime < {}".format(CHKHOST['hostcond'], dtime)
else:
cnd += "(locktime < {} OR locktime < {} AND hostname = '{}' OR locktime < {} AND hostname = 'rda_config')".format(ctime, dtime, lochost, rtime)
cnd += "(locktime < {} OR locktime < {} AND hostname = '{}' OR locktime < {} AND hostname = 'rda_config')".format(ctime, dtime, lochost, rtime)

pgrecs = PgDBI.pgmget("dlupdt", "lindex, hostname, pid, locktime", cnd, logact)
cnt = (len(pgrecs['lindex']) if pgrecs else 0)
Expand Down