Fix concurrency issue when closing sessions in ServerSessionPool

JAVA-3433
mongodb · Nov 5, 2019 · 33b86f7 · 33b86f7
1 parent 6e06585
commit 33b86f7
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java
@@ -94,7 +94,13 @@ public void close() {
         try {
             closing = true;
             serverSessionPool.close();
-            endClosedSessions();
+
+            List<BsonDocument> identifiers;
+            synchronized (this) {
+                identifiers = new ArrayList<BsonDocument>(closedSessionIdentifiers);
+                closedSessionIdentifiers.clear();
+            }
+            endClosedSessions(identifiers);
         } finally {
             closed = true;
         }
@@ -111,14 +117,21 @@ private void closeSession(final ServerSessionImpl serverSession) {
             return;
         }
 
-        closedSessionIdentifiers.add(serverSession.getIdentifier());
-        if (closedSessionIdentifiers.size() == END_SESSIONS_BATCH_SIZE) {
-            endClosedSessions();
+        List<BsonDocument> identifiers = null;
+        synchronized (this) {
+            closedSessionIdentifiers.add(serverSession.getIdentifier());
+            if (closedSessionIdentifiers.size() == END_SESSIONS_BATCH_SIZE) {
+                identifiers = new ArrayList<BsonDocument>(closedSessionIdentifiers);
+                closedSessionIdentifiers.clear();
+            }
+        }
+        if (identifiers != null) {
+            endClosedSessions(identifiers);
         }
     }
 
-    private void endClosedSessions() {
-        if (closedSessionIdentifiers.isEmpty()) {
+    private void endClosedSessions(final List<BsonDocument> identifiers) {
+        if (identifiers.isEmpty()) {
             return;
         }
 
@@ -141,12 +154,11 @@ public List<ServerDescription> select(final ClusterDescription clusterDescriptio
         }).getConnection();
         try {
             connection.command("admin",
-                    new BsonDocument("endSessions", new BsonArray(closedSessionIdentifiers)), new NoOpFieldNameValidator(),
+                    new BsonDocument("endSessions", new BsonArray(identifiers)), new NoOpFieldNameValidator(),
                     ReadPreference.primaryPreferred(), new BsonDocumentCodec(), NoOpSessionContext.INSTANCE);
         } catch (MongoException e) {
             // ignore exceptions
         } finally {
-            closedSessionIdentifiers.clear();
             connection.release();
         }
     }