JAVA-1252: Invalidate connection pool if server monitor encounters a connection error

Author: jyemin

src/main/com/mongodb/DefaultServer.java

@@ -41,10 +41,11 @@ public DefaultServer(final ServerAddress serverAddress,
         this.serverAddress = notNull("serverAddress", serverAddress);
         this.description = ServerDescription.builder().state(Connecting).address(serverAddress).build();
         serverStateListener = new DefaultServerStateListener();
+        this.connectionProvider = connectionProvider;
         this.serverMonitor = new ServerMonitor(serverAddress, serverStateListener,
-                                               settings.getHeartbeatSocketSettings(), settings, clusterId, mongo);
+                                               settings.getHeartbeatSocketSettings(), settings, clusterId, mongo,
+                                               connectionProvider);
         this.serverMonitor.start();
-        this.connectionProvider = connectionProvider;
     }
 
 

src/main/com/mongodb/ServerMonitor.java

@@ -45,6 +45,7 @@ class ServerMonitor {
     private final SocketSettings socketSettings;
     private final ServerSettings settings;
     private final Mongo mongo;
+    private final PooledConnectionProvider connectionProvider;
     private int count;
     private long elapsedNanosSum;
     private volatile ServerDescription serverDescription;
@@ -56,12 +57,14 @@ class ServerMonitor {
 
 
     ServerMonitor(final ServerAddress serverAddress, final ChangeListener<ServerDescription> serverStateListener,
-                  final SocketSettings socketSettings, final ServerSettings settings, final String clusterId, Mongo mongo) {
+                  final SocketSettings socketSettings, final ServerSettings settings, final String clusterId, Mongo mongo,
+                  final PooledConnectionProvider connectionProvider) {
         this.serverAddress = serverAddress;
         this.serverStateListener = serverStateListener;
         this.socketSettings = socketSettings;
         this.settings = settings;
         this.mongo = mongo;
+        this.connectionProvider = connectionProvider;
         serverDescription = getConnectingServerDescription();
         monitorThread = new Thread(new ServerMonitorRunnable(), "cluster-" + clusterId + "-" + serverAddress);
         monitorThread.setDaemon(true);
@@ -93,6 +96,7 @@ public void run() {
                             if (connection != null) {
                                 connection.close();
                                 connection = null;
+                                connectionProvider.invalidate();
                             }
                             connection = new DBPort(serverAddress, null, getOptions(), 0);
                             try {

src/test/com/mongodb/ServerMonitorSpecification.groovy

@@ -13,6 +13,9 @@ class ServerMonitorSpecification extends FunctionalSpecification {
     CountDownLatch latch = new CountDownLatch(1)
 
     def setup() {
+        def connectionProvider = new PooledConnectionProvider('cluster-1', new ServerAddress(), new DBPortFactory(new MongoOptions()),
+                                                              ConnectionPoolSettings.builder().maxSize(1).build(),
+                                                              new JMXConnectionPoolListener());
         serverStateNotifier = new ServerMonitor(new ServerAddress(),
                                                 new ChangeListener<ServerDescription>() {
                                                     @Override
@@ -22,7 +25,7 @@ class ServerMonitorSpecification extends FunctionalSpecification {
                                                     }
                                                 },
                                                 SocketSettings.builder().build(), ServerSettings.builder().build(),
-                                                'cluster-1', getMongoClient())
+                                                'cluster-1', getMongoClient(), connectionProvider)
         serverStateNotifier.start()
     }