Fix for multiple threads

Author: VietND96

java/src/org/openqa/selenium/grid/node/Node.java

@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
@@ -130,8 +131,8 @@ public abstract class Node implements HasReadyState, Routable {
   private final URI uri;
   private final Duration sessionTimeout;
   private final Route routes;
-  protected boolean draining;
-  protected boolean registered;
+  protected final AtomicBoolean draining = new AtomicBoolean(false);
+  protected final AtomicBoolean registered = new AtomicBoolean(false);
 
   protected Node(
       Tracer tracer, NodeId id, URI uri, Secret registrationSecret, Duration sessionTimeout) {
@@ -272,15 +273,15 @@ public Duration getSessionTimeout() {
   }
 
   public boolean isDraining() {
-    return draining;
+    return draining.get();
   }
 
   public boolean isRegistered() {
-    return registered;
+    return registered.get();
   }
 
   public void register() {
-    registered = true;
+    registered.set(true);
   }
 
   public abstract void drain();

java/src/org/openqa/selenium/grid/node/httpd/NodeServer.java

@@ -74,7 +74,6 @@
 public class NodeServer extends TemplateGridServerCommand {
 
   private static final Logger LOG = Logger.getLogger(NodeServer.class.getName());
-  private final AtomicBoolean nodeRegistered = new AtomicBoolean(false);
   private Node node;
   private EventBus bus;
   private final Thread shutdownHook =
@@ -147,7 +146,6 @@ protected Handlers createHandlers(Config config) {
         NodeAddedEvent.listener(
             nodeId -> {
               if (node.getId().equals(nodeId)) {
-                nodeRegistered.set(true);
                 node.register();
                 LOG.info("Node has been added");
               }
@@ -238,7 +236,7 @@ public NettyServer start() {
               Failsafe.with(registrationPolicy)
                   .run(
                       () -> {
-                        if (nodeRegistered.get()) {
+                        if (node.isRegistered()) {
                           throw new InterruptedException("Stopping registration thread.");
                         }
                         HealthCheck.Result check = node.getHealthCheck().check();

java/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java

@@ -415,7 +415,7 @@ public NodeStatus getStatus() {
   @Override
   public void drain() {
     events.fire(new NodeDrainStarted(getId()));
-    draining = true;
+    draining.set(true);
   }
 
   @Override

java/src/org/openqa/selenium/grid/node/local/LocalNode.java

@@ -1015,7 +1015,7 @@ public void drain() {
       AttributeMap attributeMap = tracer.createAttributeMap();
       attributeMap.put(AttributeKey.LOGGER_CLASS.getKey(), getClass().getName());
       bus.fire(new NodeDrainStarted(getId()));
-      draining = true;
+      draining.set(true);
       // Ensure the pendingSessions counter will not be decremented by timed out sessions not
       // included
       // in the currentSessionCount and the NodeDrainComplete will be raised to early.

java/src/org/openqa/selenium/grid/node/remote/RemoteNode.java

@@ -295,7 +295,7 @@ public void drain() {
     HttpResponse res = client.with(addSecret).execute(req);
 
     if (res.getStatus() == HTTP_OK) {
-      draining = true;
+      draining.set(true);
     }
   }