mirror of
https://github.com/microsoft/onefuzz.git
synced 2025-06-16 20:08:09 +00:00
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.
This commit is contained in:
@ -456,12 +456,9 @@ class Node(BASE_NODE, ORMMixin):
|
|||||||
time_filter = "Timestamp lt datetime'%s'" % (
|
time_filter = "Timestamp lt datetime'%s'" % (
|
||||||
(datetime.datetime.utcnow() - NODE_REIMAGE_TIME).isoformat()
|
(datetime.datetime.utcnow() - NODE_REIMAGE_TIME).isoformat()
|
||||||
)
|
)
|
||||||
# skip any nodes already marked for reimage/deletion
|
|
||||||
for node in cls.search(
|
for node in cls.search(
|
||||||
query={
|
query={
|
||||||
"scaleset_id": [scaleset_id],
|
"scaleset_id": [scaleset_id],
|
||||||
"reimage_requested": [False],
|
|
||||||
"delete_requested": [False],
|
|
||||||
},
|
},
|
||||||
raw_unchecked_filter=time_filter,
|
raw_unchecked_filter=time_filter,
|
||||||
):
|
):
|
||||||
|
Reference in New Issue
Block a user