Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

process all expired nodes rather than those not already marked for deletion #1103

Merged
1 commit merged into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions src/api-service/__app__/onefuzzlib/workers/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,9 @@ def reimage_long_lived_nodes(cls, scaleset_id: UUID) -> None:
time_filter = "Timestamp lt datetime'%s'" % (
(datetime.datetime.utcnow() - NODE_REIMAGE_TIME).isoformat()
)
# skip any nodes already marked for reimage/deletion
for node in cls.search(
query={
"scaleset_id": [scaleset_id],
"reimage_requested": [False],
ranweiler marked this conversation as resolved.
Show resolved Hide resolved
"delete_requested": [False],
},
raw_unchecked_filter=time_filter,
):
Expand Down
1 change: 0 additions & 1 deletion src/api-service/__app__/onefuzzlib/workers/pools.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ def halt(self) -> None:
delete_queue(self.get_pool_queue(), StorageType.corpus)
ShrinkQueue(self.pool_id).delete()
logging.info("pool stopped, deleting: %s", self.name)
self.state = PoolState.halt
ranweiler marked this conversation as resolved.
Show resolved Hide resolved
self.delete()
return

Expand Down