[grid] Sending a DELETE when a session times out.

diemol · diemol · commit 9656da70e574 · 2022-08-16T10:36:36.000+02:00
This is a more graceful way to stop an idle session. Grid was only killing the browser driver, and in some cases the browser was left open. This change attempts to avoid that by stopping the session with a DELETE. Fixes #10820
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -91,6 +91,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -180,12 +181,17 @@ private LocalNode(
       .ticker(ticker)
       .removalListener((RemovalListener<SessionId, SessionSlot>) notification -> {
         if (notification.getKey() != null && notification.getValue() != null) {
-          // Attempt to stop the session
           SessionSlot slot = notification.getValue();
-          SessionId sessionId = notification.getKey();
+          SessionId id = notification.getKey();
+          if (notification.wasEvicted()) {
+            // Session is timing out, stopping it by sending a DELETE
+            LOG.log(Level.INFO, () -> String.format("Session id %s timed out, stopping...", id));
+            slot.execute(new HttpRequest(DELETE, "/session/" + id));
+          }
+          // Attempt to stop the session
           slot.stop();
           // Invalidate temp file system
-          this.tempFileSystems.invalidate(sessionId);
+          this.tempFileSystems.invalidate(id);
           // Decrement pending sessions if Node is draining
           if (this.isDraining()) {
             int done = pendingSessions.decrementAndGet();
