Loading configuration from hub to node after registration (and re-registration). Fixes #374

Author: barancev

java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java

@@ -79,21 +79,6 @@ public SelfRegisteringRemote(RegistrationRequest request) {
 
     registrationRequest.validate();
 
-    try {
-      GridHubConfiguration hubConfiguration = getHubConfiguration();
-      // the node can not set these values. They must come from the hub
-      if (hubConfiguration.timeout != null && hubConfiguration.timeout >= 0) {
-        registrationRequest.getConfiguration().timeout = hubConfiguration.timeout;
-      }
-      if (hubConfiguration.browserTimeout != null && hubConfiguration.browserTimeout >= 0) {
-        registrationRequest.getConfiguration().browserTimeout = hubConfiguration.browserTimeout;
-      }
-    } catch (Exception e) {
-      LOG.warning(
-        "error getting the parameters from the hub. The node may end up with wrong timeouts." + e
-          .getMessage());
-    }
-
     // add the status servlet
     nodeServlets.put("/status", NodeW3CStatusServlet.class);
     nodeServlets.put("/wd/hub/status", NodeW3CStatusServlet.class);
@@ -284,6 +269,23 @@ private void registerToHub(boolean checkPresenceFirst) {
                                                 response.getStatusLine().getStatusCode(),
                                                 response.getStatusLine().getReasonPhrase()));
         }
+
+        try {
+          LOG.info("Updating the node configuration from the hub");
+          GridHubConfiguration hubConfiguration = getHubConfiguration();
+          // the node can not set these values. They must come from the hub
+          if (hubConfiguration.timeout != null && hubConfiguration.timeout >= 0) {
+            registrationRequest.getConfiguration().timeout = hubConfiguration.timeout;
+          }
+          if (hubConfiguration.browserTimeout != null && hubConfiguration.browserTimeout >= 0) {
+            registrationRequest.getConfiguration().browserTimeout = hubConfiguration.browserTimeout;
+          }
+        } catch (Exception e) {
+          LOG.warning(
+              "error getting the parameters from the hub. The node may end up with wrong timeouts." + e
+                  .getMessage());
+        }
+
         LOG.info("The node is registered to the hub and ready to use");
       } catch (Exception e) {
         throw new GridException("Error sending the registration request: " + e.getMessage());

java/server/test/org/openqa/grid/e2e/misc/HubRestart.java

@@ -50,6 +50,8 @@ public class HubRestart {
   public void prepare() throws Exception {
     config.host = "localhost";
     config.port = PortProber.findFreePort();
+    config.timeout = 10;
+    config.browserTimeout = 10;
     hub = GridTestHelper.getHub(config);
     registry = hub.getRegistry();
 
@@ -59,7 +61,6 @@ public void prepare() throws Exception {
 
     remote.setRemoteServer(new SeleniumServer(remote.getConfiguration()));
     remote.startRemoteServer();
-
   }
 
   @Test(timeout = 5000)
@@ -72,13 +73,18 @@ public void nodeRegisterAgain() throws Exception {
     // should be up
     RegistryTestHelper.waitForNode(hub.getRegistry(), 1);
 
+    assertEquals(remote.getConfiguration().timeout.intValue(), 10);
+    assertEquals(remote.getConfiguration().browserTimeout.intValue(), 10);
+
     // crashing the hub.
     hub.stop();
 
     // check that the remote do not crash if there is no hub to reply.
     Thread.sleep(1000);
 
     // and starting a new hub
+    config.timeout = 20;
+    config.browserTimeout = 20;
     hub = new Hub(config);
     registry = hub.getRegistry();
     // should be empty
@@ -88,6 +94,8 @@ public void nodeRegisterAgain() throws Exception {
     // the node will appear again after 250 ms.
     RegistryTestHelper.waitForNode(hub.getRegistry(), 1);
 
+    assertEquals(remote.getConfiguration().timeout.intValue(), 20);
+    assertEquals(remote.getConfiguration().browserTimeout.intValue(), 20);
   }
 
   @After

java/server/test/org/openqa/grid/e2e/utils/GridTestHelper.java

@@ -40,7 +40,10 @@ public static SelfRegisteringRemote getRemoteWithoutCapabilities(Hub hub, GridRo
   }
 
   public static SelfRegisteringRemote getRemoteWithoutCapabilities(URL hub, GridRole role) {
-    String[] args = {"-role", "node","-host","localhost","-hub",hub.toString(),"-port",String.valueOf(PortProber.findFreePort())};
+    String[] args = {"-role", role.toString(),
+                     "-host","localhost",
+                     "-hub",hub.toString(),
+                     "-port",String.valueOf(PortProber.findFreePort())};
     GridNodeConfiguration config = new GridNodeConfiguration();
     new JCommander(config, args);
     RegistrationRequest req = RegistrationRequest.build(config);