WIP

JAVA-4646

Author: jyemin

driver-core/src/main/com/mongodb/internal/connection/DefaultServer.java

@@ -17,6 +17,7 @@
 package com.mongodb.internal.connection;
 
 import com.mongodb.MongoException;
+import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoServerUnavailableException;
 import com.mongodb.MongoSocketException;
 import com.mongodb.ReadPreference;
@@ -201,6 +202,10 @@ public <T> T execute(final CommandProtocol<T> protocol, final InternalConnection
             try {
                 protocol.sessionContext(new ClusterClockAdvancingSessionContext(sessionContext, clusterClock));
                 return protocol.execute(connection);
+            } catch (MongoInterruptedException e) {
+                // Doing this so that we don't try to grab a lock by calling into sdam machinery in the next catch block, and masking
+                // this exception as a result
+                throw e;
             } catch (MongoException e) {
                 sdam.handleExceptionAfterHandshake(SdamIssue.specific(e, sdam.context(connection)));
                 if (e instanceof MongoWriteConcernWithResponseException) {

driver-core/src/main/com/mongodb/internal/connection/SocketStream.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.internal.connection;
 
+import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoSocketException;
 import com.mongodb.MongoSocketOpenException;
 import com.mongodb.MongoSocketReadException;
@@ -136,8 +137,18 @@ public ByteBuf read(final int numBytes, final int additionalTimeout) throws IOEx
         }
         try {
             return read(numBytes);
+        } catch (IOException e) {
+            // This logic should move up, and also be on the write path, but it's a start
+            if (Thread.currentThread().isInterrupted()) {
+                throw new MongoInterruptedException("Socket read interrupted", e);
+            } else {
+                throw e;
+            }
         } finally {
-            socket.setSoTimeout(curTimeout);
+            // Adding this check because otherwise setSoTimeout throws, masking the original exception
+            if (!socket.isClosed()) {
+                socket.setSoTimeout(curTimeout);
+            }
         }
     }