[grid] Reduce redundant logs of find slots and retry queue requests by the Distributor

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

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

@@ -512,8 +512,14 @@ protected Set<NodeStatus> getAvailableNodes() {
     try {
       return model.getSnapshot().stream()
           .filter(
-              node ->
-                  !DOWN.equals(node.getAvailability()) && !DRAINING.equals(node.getAvailability()))
+              node -> {
+                // Only consider UP nodes (not DOWN, DRAINING, etc.)
+                if (!UP.equals(node.getAvailability())) {
+                  return false;
+                }
+                // Consider node has at least one free slot
+                return node.getSlots().stream().anyMatch(slot -> slot.getSession() == null);
+              })
           .collect(toImmutableSet());
     } finally {
       readLock.unlock();
@@ -704,8 +710,7 @@ private SlotId reserveSlot(RequestId requestId, Capabilities caps) {
   }
 
   private boolean isNotSupported(Capabilities caps) {
-    return getAvailableNodes().stream()
-        .noneMatch(node -> node.hasCapability(caps, slotMatcher) && node.getAvailability() == UP);
+    return getAvailableNodes().stream().noneMatch(node -> node.hasCapability(caps, slotMatcher));
   }
 
   private boolean reserve(SlotId id) {
@@ -795,7 +800,7 @@ public void run() {
         // up starving a session request.
         Map<Capabilities, Long> stereotypes =
             getAvailableNodes().stream()
-                .filter(node -> node.hasCapacity() && node.getAvailability() == UP)
+                .filter(NodeStatus::hasCapacity)
                 .flatMap(node -> node.getSlots().stream().map(Slot::getStereotype))
                 .collect(
                     Collectors.groupingBy(ImmutableCapabilities::copyOf, Collectors.counting()));

java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java

@@ -55,6 +55,7 @@
 import org.openqa.selenium.grid.data.TraceSessionRequest;
 import org.openqa.selenium.grid.distributor.config.DistributorOptions;
 import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.MBean;
 import org.openqa.selenium.grid.jmx.ManagedAttribute;
 import org.openqa.selenium.grid.jmx.ManagedService;
 import org.openqa.selenium.grid.log.LoggingOptions;
@@ -110,6 +111,7 @@ public class LocalNewSessionQueue extends NewSessionQueue implements Closeable {
             thread.setName(NAME);
             return thread;
           });
+  private final MBean jmxBean;
 
   public LocalNewSessionQueue(
       Tracer tracer,
@@ -139,7 +141,8 @@ public LocalNewSessionQueue(
         requestTimeoutCheck.toMillis(),
         MILLISECONDS);
 
-    new JMXHelper().register(this);
+    // Manage JMX and unregister on close()
+    this.jmxBean = new JMXHelper().register(this);
   }
 
   public static NewSessionQueue create(Config config) {
@@ -502,6 +505,10 @@ public boolean isReady() {
   @Override
   public void close() {
     shutdownGracefully(NAME, service);
+
+    if (jmxBean != null) {
+      new JMXHelper().unregister(jmxBean.getObjectName());
+    }
   }
 
   private void failDueToTimeout(RequestId reqId) {