Skip to content
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

ws_expirer: add option for running on storage targets only #126

Merged
merged 2 commits into from
Mar 17, 2025
Merged

ws_expirer: add option for running on storage targets only #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c7015
ws_expirer: add option for running on storage targets only
staeglis Jan 9, 2025
9017fbd
fix spaces variable
staeglis Jan 9, 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
49 changes: 43 additions & 6 deletions sbin/ws_expirer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,15 @@ def processOpts():
default=False,
help="enable cleanup run (default is dry run)",
)
parser.add_option(
"-s",
"--space",
action="callback",
dest="single_space",
callback=vararg_callback,
default="",
help="pass a single space (inside a workspace) to clean up"
)
(options, args) = parser.parse_args()
if not options:
print("*** FATAL: No options defined. ***")
Expand Down Expand Up @@ -309,6 +318,13 @@ if not opts.fslist:
else:
fslist = opts.fslist

single_space = ""
try:
single_space = opts.single_space[0]
print(single_space)
except IndexError:
single_space = ""

if fslist == []:
print("Error: no workspace defined")
sys.exit(2)
Expand All @@ -333,7 +349,7 @@ for fs in fslist:
except KeyError:
print(" FAILED to access", fs, "in config file")
continue
spaces = config["workspaces"][fs]["spaces"]
spaces = config["workspaces"][fs]["spaces"].copy()
# avoid datarace, fetch directories first and db entries second (1),
# so entries created during this run of expirer will be ignored
# this eats memory, but... generators from python3 pathlib.Path.glob
Expand Down Expand Up @@ -361,7 +377,12 @@ for fs in fslist:
dbentriesws = get_dbentriesws(dbentries)
dbentryworkspaces = list(map(os.path.basename, dbentriesws))
workspacedelprefix = config["workspaces"][fs]["deleted"]
print("PHASE: checking for stray workspaces for", fs, dbdir, spaces)
if single_space != "":
spaces.remove(single_space)
print("PHASE: checking for stray workspaces for", fs, dbdir, single_space, ", ignoring ", spaces)
spaces = [single_space]
else:
print("PHASE: checking for stray workspaces for", fs, dbdir, spaces)
for space in spaces:
for ws in workspaces[space]: # (2) for for #87
if os.path.basename(ws) not in dbentryworkspaces:
Expand Down Expand Up @@ -424,7 +445,9 @@ for fs in fslist:
# this searches over DB, nothing not in DB will be touched
for fs in fslist:
try:
spaces = config["workspaces"][fs]["spaces"]
print("test")
spaces = config["workspaces"][fs]["spaces"].copy()
print(config["workspaces"][fs]["spaces"])
except KeyError:
print(" FAILED to access", fs, "in config file")
continue
Expand All @@ -446,7 +469,12 @@ for fs in fslist:
senderrormail("DB directory {0} does not contain .ws_db_magic, skipping to avoid data loss. Please check!".format(dbdir))
continue

print("PHASE: checking for workspaces to be expired for", fs, dbdir, spaces)
if single_space != "":
spaces.remove(single_space)
print("checking for workspaces to be expired for", fs, dbdir, single_space, ", ignoring ", spaces)
spaces = [single_space]
else:
print("PHASE: checking for workspaces to be expired for", fs, dbdir, spaces)
for dbentryfilename in glob.glob(os.path.join(dbdir, "*-*")):
reminder = 0
mailaddress = ""
Expand Down Expand Up @@ -484,6 +512,8 @@ for fs in fslist:
if workspace == "" or expiration == 0:
print(" FAILED to parse DB for", dbentryfilename)
continue
if single_space != "" and single_space not in workspace:
continue
if time.time() > expiration:
print(" expiring", dbentryfilename, " (expired", time.ctime(expiration), ")")
timestamp = str(int(time.time()))
Expand Down Expand Up @@ -558,7 +588,7 @@ for fs in fslist:
# this searches over DB
for fs in fslist:
try:
spaces = config["workspaces"][fs]["spaces"]
spaces = config["workspaces"][fs]["spaces"].copy()
except KeyError:
print(" FAILED to access", fs, "in config file")
continue
Expand All @@ -578,7 +608,12 @@ for fs in fslist:
senderrormail("DB directory {0} does not contain .ws_db_magic, skipping to avoid data loss. Please check!".format(dbdir))
continue

print("PHASE: checking for expired workspaces for", fs, dbdir, spaces)
if single_space != "":
spaces.remove(single_space)
print("PHASE: checking for expired workspaces for", fs, dbdir, single_space, ", ignoring ", spaces)
spaces = [single_space]
else:
print("PHASE: checking for expired workspaces for", fs, dbdir, spaces)
dbdeldir = os.path.join(config["workspaces"][fs]["database"], config["workspaces"][fs]["deleted"])
keeptime = config["workspaces"][fs]["keeptime"]
print(" keeptime:", keeptime)
Expand All @@ -600,6 +635,8 @@ for fs in fslist:
if workspace == "" or expiration == 0:
print(" FAILED to parse DB for", dbentryfilename)
continue
if single_space != "" and single_space not in workspace:
continue
# take time of release from filename
released = dbentryfilename.split("-")[-1]
try:
Expand Down