[grid] Covering use case where a Node is UP after being marked DOWN

diemol · diemol · commit 20c084f902ba · 2023-07-28T17:41:57.000+02:00
Fixes #12116
diff --git a/java/src/org/openqa/selenium/grid/distributor/GridModel.java b/java/src/org/openqa/selenium/grid/distributor/GridModel.java
@@ -178,15 +178,22 @@ public void refresh(NodeStatus status) {
     }
   }
 
-  public void touch(NodeId id) {
-    Require.nonNull("Node ID", id);
+  public void touch(NodeStatus nodeStatus) {
+    Require.nonNull("Node ID", nodeStatus);
 
     Lock writeLock = lock.writeLock();
     writeLock.lock();
     try {
-      NodeStatus node = getNode(id);
+      NodeStatus node = getNode(nodeStatus.getNodeId());
       if (node != null) {
         nodePurgeTimes.put(node.getNodeId(), Instant.now());
+        // Covers the case where the Node might be DOWN in the Grid model (e.g. Node lost
+        // connectivity for a while). The Node reports itself back as UP.
+        if (node.getAvailability() != nodeStatus.getAvailability()
+            && nodeStatus.getAvailability() == UP) {
+          nodes.remove(node);
+          nodes.add(nodeStatus);
+        }
       }
     } finally {
       writeLock.unlock();
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -205,7 +205,7 @@ public LocalDistributor(
         NodeHeartBeatEvent.listener(
             nodeStatus -> {
               if (nodes.containsKey(nodeStatus.getNodeId())) {
-                model.touch(nodeStatus.getNodeId());
+                model.touch(nodeStatus);
               } else {
                 register(nodeStatus);
               }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public LocalDistributor(`
`205`	`205`	`NodeHeartBeatEvent.listener(`
`206`	`206`	`nodeStatus -> {`
`207`	`207`	`if (nodes.containsKey(nodeStatus.getNodeId())) {`
`208`		`- model.touch(nodeStatus.getNodeId());`
	`208`	`+ model.touch(nodeStatus);`
`209`	`209`	`} else {`
`210`	`210`	`register(nodeStatus);`
`211`	`211`	`}`