Skip to content

Do not skip locked datasets when gathering changed files #49

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
Oct 1, 2026
Merged

Do not skip locked datasets when gathering changed files #49

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_dsquasar"
version = "3.0.16"
version = "3.0.17"
authors = [
{ name="Zaihua Ji", email="zji@ucar.edu" },
]
Expand Down
6 changes: 5 additions & 1 deletion src/rda_python_dsquasar/dsquasar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,11 @@ def gather_dataset_files(self, dsfiles, unlock = True, sizes = None):
# them before any work, and -A 3 does a third one before tarring
self.check_batch_deadline()
dsid = pgrec['dsid']
if unlock and pgrec['pid'] and self.lock_dataset(dsid, 0, self.LOGACT) < 1: continue
# a changed-file run takes records that are already backed up (bid > 0) while the
# main runs take new files (bid = 0), so it shares no record with the worker holding
# the lock and must not skip the dataset for it
if unlock and pgrec['pid'] and not self.PGBACK['chgdays']:
if self.lock_dataset(dsid, 0, self.LOGACT) < 1: continue
fcnt += self.get_dataset_files(dsid, dsfiles, pgrec['backflag'], logact, sizes)
if dsfiles:
s = 's' if fcnt > 1 else ''
Expand Down
Loading