Do not switch and remove node in one iteration (#11961)

Co-authored-by: Diego Molina <[email protected]>
SeleniumHQ · May 2, 2023 · 9ac368b · 9ac368b
1 parent 83b0b0d
commit 9ac368b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/java/src/org/openqa/selenium/grid/distributor/GridModel.java b/java/src/org/openqa/selenium/grid/distributor/GridModel.java
@@ -224,8 +224,8 @@ public void purgeDeadNodes() {
         if (node.getAvailability() == UP && lostTime.isBefore(now)) {
           LOG.info(String.format("Switching Node %s from UP to DOWN", node.getExternalUri()));
           replacements.put(node, rewrite(node, DOWN));
-        }
-        if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
+          nodePurgeTimes.put(id, Instant.now());
+        } else if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
           LOG.info(String.format("Removing Node %s, DOWN for too long", node.getExternalUri()));
           toRemove.add(node);
         }