SERVER-37081 Catch asio::system_errors when resolving GenericSocket

2 files changed, 11 insertions, 7 deletions

diff --git a/src/mongo/transport/session_asio.h b/src/mongo/transport/session_asio.h
index d1c2bd865eb..00eab1d0ae0 100644
--- a/src/mongo/transport/session_asio.h
+++ b/src/mongo/transport/session_asio.h
@@ -227,7 +227,7 @@ protected:
             if (_blockingMode == Sync) {
                 std::error_code ec;
                 _sslSocket->handshake(asio::ssl::stream_base::client, ec);
-                return Future<void>::makeReady(errorCodeToStatus(ec));
+                return futurize(ec);
             } else {
                 return _sslSocket->async_handshake(asio::ssl::stream_base::client, UseFuture{});
             }
diff --git a/src/mongo/transport/transport_layer_asio.cpp b/src/mongo/transport/transport_layer_asio.cpp
index 617dced8cac..ad87ea0ed38 100644
--- a/src/mongo/transport/transport_layer_asio.cpp
+++ b/src/mongo/transport/transport_layer_asio.cpp
@@ -114,7 +114,7 @@ private:
             });
 
         } catch (asio::system_error& ex) {
-            return Future<void>::makeReady(errorCodeToStatus(ex.code()));
+            return futurize(ex.code());
         }
     }
 
@@ -561,11 +561,15 @@ Future<SessionHandle> TransportLayerASIO::asyncConnect(HostAndPort peer,
 
     connector->resolver.asyncResolve(connector->peer, _listenerOptions.enableIPv6)
         .then([connector](WrappedResolver::EndpointVector results) {
-            stdx::unique_lock<stdx::mutex> lk(connector->mutex);
-            connector->resolvedEndpoint = results.front();
-            connector->socket.open(connector->resolvedEndpoint->protocol());
-            connector->socket.non_blocking(true);
-            lk.unlock();
+            try {
+                stdx::lock_guard<stdx::mutex> lk(connector->mutex);
+
+                connector->resolvedEndpoint = results.front();
+                connector->socket.open(connector->resolvedEndpoint->protocol());
+                connector->socket.non_blocking(true);
+            } catch (asio::system_error& ex) {
+                return futurize(ex.code());
+            }
 
             return connector->socket.async_connect(*connector->resolvedEndpoint, UseFuture{});
         })