[java] Return appropriate Http response code if Grid is not ready

pujagani · pujagani · commit a88f1f1f36f2 · 2022-03-09T16:39:54.000+05:30
Fixes #10391
diff --git a/java/src/org/openqa/selenium/grid/router/GridStatusHandler.java b/java/src/org/openqa/selenium/grid/router/GridStatusHandler.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 
+import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toList;
 import static org.openqa.selenium.grid.data.Availability.UP;
@@ -145,10 +146,15 @@ public HttpResponse execute(HttpRequest req) {
 
       HttpResponse res = new HttpResponse()
         .setContent(asJson(ImmutableMap.of("value", value.build())));
+      if (ready) {
+        span.setStatus(Status.OK);
+      } else {
+        res.setStatus(HTTP_UNAVAILABLE);
+        span.setStatus(Status.UNAVAILABLE);
+      }
       HTTP_RESPONSE.accept(span, res);
       HTTP_RESPONSE_EVENT.accept(attributeMap, res);
       attributeMap.put("grid.status", EventAttribute.setValue(ready));
-      span.setStatus(Status.OK);
       span.addEvent("Computed grid status", attributeMap);
       return res;
     }
diff --git a/java/test/org/openqa/selenium/grid/router/RouterTest.java b/java/test/org/openqa/selenium/grid/router/RouterTest.java
@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.grid.router;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.openqa.selenium.grid.data.Availability.DOWN;
@@ -128,6 +129,13 @@ public void shouldListAnEmptyDistributorAsMeaningTheGridIsNotReady() {
     assertFalse((Boolean) status.get("ready"));
   }
 
+  @Test
+  public void shouldReturnServerErrorCodeWhenGridIsNotReady() {
+    HttpResponse response = getStatusHttpResponse(router);
+    assertNotNull(response);
+    assertEquals(503, response.getStatus());
+  }
+
   @Test
   public void addingANodeThatIsDownMeansTheGridIsNotReady() throws URISyntaxException {
     Capabilities capabilities = new ImmutableCapabilities("cheese", "peas");
@@ -179,4 +187,8 @@ private Map<String, Object> getStatus(Router router) {
     assertNotNull(status);
     return status;
   }
+
+  private HttpResponse getStatusHttpResponse(Router router) {
+    return router.execute(new HttpRequest(GET, "/status"));
+  }
 }
