Issue #5108 - use HashSet for SessionTrackers to improve scalability

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Aug 3, 2020 · d37501d · d37501d
1 parent 66ec160
commit d37501d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/...ocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSessionTracker.java b/...ocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSessionTracker.java
@@ -19,37 +19,47 @@
 package org.eclipse.jetty.websocket.jsr356;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import javax.websocket.Session;
 
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.util.component.LifeCycle;
 
 public class JsrSessionTracker extends AbstractLifeCycle implements JsrSessionListener
 {
-    private CopyOnWriteArraySet<JsrSession> sessions = new CopyOnWriteArraySet<>();
+    private final Set<JsrSession> sessions = new HashSet<>();
 
-    public Set<javax.websocket.Session> getSessions()
+    public Set<Session> getSessions()
     {
-        return Collections.unmodifiableSet(sessions);
+        synchronized (this)
+        {
+            return Collections.unmodifiableSet(new HashSet<>(sessions));
+        }
     }
 
     @Override
     public void onSessionOpened(JsrSession session)
     {
-        sessions.add(session);
+        synchronized (this)
+        {
+            sessions.add(session);
+        }
     }
 
     @Override
     public void onSessionClosed(JsrSession session)
     {
-        sessions.remove(session);
+        synchronized (this)
+        {
+            sessions.remove(session);
+        }
     }
 
     @Override
     protected void doStop() throws Exception
     {
-        for (JsrSession session : sessions)
+        for (Session session : getSessions())
         {
             LifeCycle.stop(session);
         }

diff --git a/...ket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java b/...ket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java
@@ -20,40 +20,49 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.component.LifeCycle;
 
 public class SessionTracker extends AbstractLifeCycle implements WebSocketSessionListener, Dumpable
 {
-    private CopyOnWriteArraySet<WebSocketSession> sessions = new CopyOnWriteArraySet<>();
+    private final Set<WebSocketSession> sessions = new HashSet<>();
 
     public Set<WebSocketSession> getSessions()
     {
-        return Collections.unmodifiableSet(sessions);
+        synchronized (this)
+        {
+            return Collections.unmodifiableSet(new HashSet<>(sessions));
+        }
     }
 
     @Override
     public void onSessionCreated(WebSocketSession session)
     {
         LifeCycle.start(session);
-        sessions.add(session);
+        synchronized (this)
+        {
+            sessions.add(session);
+        }
     }
 
     @Override
     public void onSessionClosed(WebSocketSession session)
     {
-        sessions.remove(session);
+        synchronized (this)
+        {
+            sessions.remove(session);
+        }
         LifeCycle.stop(session);
     }
 
     @Override
     protected void doStop() throws Exception
     {
-        for (WebSocketSession session : sessions)
+        for (WebSocketSession session : getSessions())
         {
             LifeCycle.stop(session);
         }
@@ -63,6 +72,6 @@ protected void doStop() throws Exception
     @Override
     public void dump(Appendable out, String indent) throws IOException
     {
-        Dumpable.dumpObjects(out, indent, this, sessions);
+        Dumpable.dumpObjects(out, indent, this, getSessions());
     }
 }