Merge branch 'trunk' into pallavi-getCookieRuby

Author: rpallavisharma

WORKSPACE

@@ -6,6 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_closure",
+    integrity = "sha256-lJjlc2jvuCuYXbHtQmp2fL8boDmP167WMvw5CGVOGx4=",
     strip_prefix = "rules_closure-0.12.0",
     url = "https://github.com/bazelbuild/rules_closure/archive/refs/tags/0.12.0.tar.gz",
 )

java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel

@@ -31,6 +31,5 @@ java_library(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         artifact("com.google.guava:guava"),
-        artifact("dev.failsafe:failsafe"),
     ],
 )

java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java

@@ -34,8 +34,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import dev.failsafe.Failsafe;
-import dev.failsafe.RetryPolicy;
 import java.io.Closeable;
 import java.io.UncheckedIOException;
 import java.net.URI;
@@ -375,7 +373,10 @@ public LocalDistributor add(Node node) {
       return this;
     }
 
-    updateNodeStatus(initialNodeStatus, healthCheck);
+    updateNodeAvailability(
+        initialNodeStatus.getExternalUri(),
+        initialNodeStatus.getNodeId(),
+        initialNodeStatus.getAvailability());
 
     LOG.info(
         String.format(
@@ -387,30 +388,6 @@ public LocalDistributor add(Node node) {
     return this;
   }
 
-  private void updateNodeStatus(NodeStatus status, Runnable healthCheck) {
-    // Setting the Node as available if the initial call to status was successful.
-    // Otherwise, retry to have it available as soon as possible.
-    if (status.getAvailability() == UP) {
-      updateNodeAvailability(status.getExternalUri(), status.getNodeId(), status.getAvailability());
-    } else {
-      // Running the health check right after the Node registers itself. We retry the
-      // execution because the Node might on a complex network topology. For example,
-      // Kubernetes pods with IPs that take a while before they are reachable.
-      RetryPolicy<Object> initialHealthCheckPolicy =
-          RetryPolicy.builder()
-              .withMaxAttempts(-1)
-              .withMaxDuration(Duration.ofSeconds(90))
-              .withDelay(Duration.ofSeconds(15))
-              .abortIf(result -> true)
-              .build();
-
-      LOG.log(getDebugLogLevel(), "Running health check for Node " + status.getExternalUri());
-      ExecutorService executor = Executors.newSingleThreadExecutor();
-      executor.submit(() -> Failsafe.with(initialHealthCheckPolicy).run(healthCheck::run));
-      executor.shutdown();
-    }
-  }
-
   private Runnable runNodeHealthChecks() {
     return () -> {
       ImmutableMap<NodeId, Runnable> nodeHealthChecks;

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

@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.UUID;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -245,7 +244,7 @@ public TemporaryFilesystem getUploadsFilesystem(SessionId id) throws IOException
     throw new UnsupportedOperationException();
   }
 
-  public TemporaryFilesystem getDownloadsFilesystem(UUID uuid) throws IOException {
+  public TemporaryFilesystem getDownloadsFilesystem(SessionId id) throws IOException {
     throw new UnsupportedOperationException();
   }
 

java/src/org/openqa/selenium/grid/node/docker/DockerFlags.java

@@ -54,6 +54,17 @@ public class DockerFlags implements HasRoles {
   @ConfigValue(section = DockerOptions.DOCKER_SECTION, name = "port", example = "2375")
   private Integer dockerPort;
 
+  @Parameter(
+      names = {"--docker-server-start-timeout"},
+      description =
+          "Max time (in seconds) to wait for the server to successfully start up, before cancelling"
+              + " the process.")
+  @ConfigValue(
+      section = DockerOptions.DOCKER_SECTION,
+      name = "server-start-timeout",
+      example = "55")
+  private Integer serverStartTimeout;
+
   @Parameter(
       names = {"--docker", "-D"},
       description =

java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.Multimap;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -63,6 +64,7 @@ public class DockerOptions {
   static final String DEFAULT_DOCKER_URL = "unix:/var/run/docker.sock";
   static final String DEFAULT_VIDEO_IMAGE = "false";
   static final int DEFAULT_MAX_SESSIONS = Runtime.getRuntime().availableProcessors();
+  static final int DEFAULT_SERVER_START_TIMEOUT = 60;
   private static final String DEFAULT_DOCKER_NETWORK = "bridge";
   private static final Logger LOG = Logger.getLogger(DockerOptions.class.getName());
   private static final Json JSON = new Json();
@@ -104,6 +106,11 @@ private URI getDockerUri() {
     }
   }
 
+  private Duration getServerStartTimeout() {
+    return Duration.ofSeconds(
+        config.getInt(DOCKER_SECTION, "server-start-timeout").orElse(DEFAULT_SERVER_START_TIMEOUT));
+  }
+
   private boolean isEnabled(Docker docker) {
     if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {
       return false;
@@ -179,6 +186,7 @@ public Map<Capabilities, Collection<SessionFactory>> getDockerSessionFactories(
                     tracer,
                     clientFactory,
                     options.getSessionTimeout(),
+                    getServerStartTimeout(),
                     docker,
                     getDockerUri(),
                     image,

java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java

@@ -91,6 +91,7 @@ public class DockerSessionFactory implements SessionFactory {
   private final Tracer tracer;
   private final HttpClient.Factory clientFactory;
   private final Duration sessionTimeout;
+  private final Duration serverStartTimeout;
   private final Docker docker;
   private final URI dockerUri;
   private final Image browserImage;
@@ -108,6 +109,7 @@ public DockerSessionFactory(
       Tracer tracer,
       HttpClient.Factory clientFactory,
       Duration sessionTimeout,
+      Duration serverStartTimeout,
       Docker docker,
       URI dockerUri,
       Image browserImage,
@@ -123,6 +125,7 @@ public DockerSessionFactory(
     this.tracer = Require.nonNull("Tracer", tracer);
     this.clientFactory = Require.nonNull("HTTP client", clientFactory);
     this.sessionTimeout = Require.nonNull("Session timeout", sessionTimeout);
+    this.serverStartTimeout = Require.nonNull("Server start timeout", serverStartTimeout);
     this.docker = Require.nonNull("Docker command", docker);
     this.dockerUri = Require.nonNull("Docker URI", dockerUri);
     this.browserImage = Require.nonNull("Docker browser image", browserImage);
@@ -181,7 +184,7 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
               "Waiting for server to start (container id: %s, url %s)",
               container.getId(), remoteAddress));
       try {
-        waitForServerToStart(client, Duration.ofMinutes(1));
+        waitForServerToStart(client, serverStartTimeout);
       } catch (TimeoutException e) {
         span.setAttribute(AttributeKey.ERROR.getKey(), true);
         span.setStatus(Status.CANCELLED);
@@ -367,7 +370,7 @@ private Container startVideoContainer(
         clientFactory.createClient(ClientConfig.defaultConfig().baseUri(videoContainerUrl));
     try {
       LOG.fine(String.format("Waiting for video recording... (id: %s)", videoContainer.getId()));
-      waitForServerToStart(videoClient, Duration.ofMinutes(1));
+      waitForServerToStart(videoClient, serverStartTimeout);
     } catch (Exception e) {
       videoContainer.stop(Duration.ofSeconds(10));
       String message =