From 9ec7e7a20a104d509c8756cd26e123d4711d82f5 Mon Sep 17 00:00:00 2001 From: bmc-msft <41130664+bmc-msft@users.noreply.github.com> Date: Mon, 26 Jul 2021 20:53:04 -0400 Subject: [PATCH] process all expired nodes rather than those not already marked for deletion (#1103) This makes sure debug_keep_node is reset and the rest of the reimage processing occurs regardless of reimage_requested and delete_requested being set. Without this, nodes that are marked `debug_keep_node` do not get reimaged/deleted. --- src/api-service/__app__/onefuzzlib/workers/nodes.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/api-service/__app__/onefuzzlib/workers/nodes.py b/src/api-service/__app__/onefuzzlib/workers/nodes.py index 4da60d36a..a4a6ae137 100644 --- a/src/api-service/__app__/onefuzzlib/workers/nodes.py +++ b/src/api-service/__app__/onefuzzlib/workers/nodes.py @@ -456,12 +456,9 @@ class Node(BASE_NODE, ORMMixin): 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], - "delete_requested": [False], }, raw_unchecked_filter=time_filter, ):