A pooled DBPort instance now determines its own server version

 JAVA-1635

Author: jyemin

src/main/com/mongodb/DBApiLayer.java

@@ -250,8 +250,7 @@ CommandResult doAuthenticate(MongoCredential credentials) {
     boolean isServerVersionAtLeast(final List<Integer> versionList) {
         DBPort primaryPort = getConnector().getPrimaryPort();
         try {
-            return getConnector().getServerDescription(primaryPort.getAddress()).getVersion()
-                                 .compareTo(new ServerVersion(versionList)) >= 0;
+            return primaryPort.getServerVersion().compareTo(new ServerVersion(versionList)) >= 0;
         } finally {
            _connector.releasePort(primaryPort);
         }

src/main/com/mongodb/DBCollectionImpl.java

@@ -382,7 +382,7 @@ public void createIndex(final DBObject keys, final DBObject options, DBEncoder e
             index.putAll(options);
             index.put("key", keys);
 
-            if (connector.getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(2, 6)) >= 0) {
+            if (port.getServerVersion().compareTo(new ServerVersion(2, 6)) >= 0) {
                 final BasicDBObject createIndexes = new BasicDBObject("createIndexes", getName());
 
                 BasicDBList list = new BasicDBList();
@@ -493,7 +493,7 @@ public BulkWriteResult execute() throws IOException {
 
     private boolean useWriteCommands(final WriteConcern concern, final DBPort port) {
         return concern.callGetLastError() &&
-               db.getConnector().getServerDescription(port.getAddress()).getVersion().compareTo(new ServerVersion(2, 6)) >= 0;
+               port.getServerVersion().compareTo(new ServerVersion(2, 6)) >= 0;
     }
 
     private MessageSettings getMessageSettings(final DBPort port) {

src/main/com/mongodb/DBPort.java

@@ -86,10 +86,20 @@ public class DBPort implements Connection {
      */
     @SuppressWarnings("deprecation")
     public DBPort( ServerAddress addr ){
-        this( addr , null , new MongoOptions(), 0 );
+        this( addr , new MongoOptions());
     }
-    
-    DBPort( ServerAddress addr, PooledConnectionProvider pool, MongoOptions options, int generation ) {
+
+    // Normal usage
+    DBPort( ServerAddress addr, PooledConnectionProvider pool, Mongo mongo, int generation ) {
+        this(addr, pool, mongo, mongo.getMongoOptions(), generation);
+    }
+
+    // Server monitor usage
+    DBPort( ServerAddress addr, MongoOptions options ) {
+        this(addr, null, null, options, 0);
+    }
+
+    private DBPort( ServerAddress addr, PooledConnectionProvider pool, Mongo mongo, MongoOptions options, int generation ) {
         _options = options;
         _sa = addr;
         _addr = addr;
@@ -98,8 +108,8 @@ public DBPort( ServerAddress addr ){
 
         _logger = Logger.getLogger( _rootLogger.getName() + "." + addr.toString() );
         try {
-            ensureOpen();
             _decoder = _options.dbDecoderFactory.create();
+            ensureOpen(mongo);
             openedAt = System.currentTimeMillis();
             lastUsedAt = openedAt;
         } catch (IOException e) {
@@ -248,6 +258,15 @@ InputStream getInputStream() throws IOException {
      * @throws IOException
      */
     public synchronized void ensureOpen() throws IOException {
+        ensureOpen(null);
+    }
+
+    /**
+     * makes sure that a connection to the server has been opened
+     * @throws IOException
+     * @param mongo
+     */
+    private synchronized void ensureOpen(final Mongo mongo) throws IOException {
 
         if ( _socket != null )
             return;
@@ -271,6 +290,9 @@ public synchronized void ensureOpen() throws IOException {
                 _socket.setSoTimeout( _options.socketTimeout );
                 _in = new BufferedInputStream( _socket.getInputStream() );
                 _out = _socket.getOutputStream();
+                if (mongo != null) {
+                    _serverVersion = ServerMonitor.getVersion(runCommand(mongo.getDB("admin"), new BasicDBObject("buildinfo", 1)));
+                }
                 successfullyConnected = true;
             }
             catch ( IOException e ){
@@ -364,7 +386,7 @@ CommandResult authenticate(Mongo mongo, final MongoCredential credentials) {
         Authenticator authenticator;
         MongoCredential actualCredentials;
         if (credentials.getMechanism() == null) {
-            if (mongo.getConnector().getServerDescription(getAddress()).getVersion().compareTo(new ServerVersion(3, 0)) >= 0) {
+            if (_serverVersion.compareTo(new ServerVersion(3, 0)) >= 0) {
                 actualCredentials = MongoCredential.createScramSha1Credential(credentials.getUserName(), credentials.getSource(),
                                                                               credentials.getPassword());
             } else {
@@ -415,6 +437,10 @@ public long getUsageCount() {
         return usageCount;
     }
 
+    ServerVersion getServerVersion() {
+        return _serverVersion;
+    }
+
     PooledConnectionProvider getProvider() {
         return provider;
     }
@@ -440,6 +466,7 @@ Set<String> getAuthenticatedDatabases() {
     private volatile Socket _socket;
     private volatile InputStream _in;
     private volatile OutputStream _out;
+    private volatile ServerVersion _serverVersion;
 
     // needs synchronization to ensure that modifications are published.
     private final Set<String> authenticatedDatabases = Collections.synchronizedSet(new HashSet<String>());

src/main/com/mongodb/DBPortFactory.java

@@ -17,14 +17,14 @@
 package com.mongodb;
 
 class DBPortFactory implements ConnectionFactory {
-    private final MongoOptions options;
+    private final Mongo mongo;
 
-    DBPortFactory(MongoOptions options) {
-        this.options = options;
+    DBPortFactory(Mongo mongo) {
+        this.mongo = mongo;
     }
 
     @Override
     public Connection create(ServerAddress serverAddress, PooledConnectionProvider provider, int generation) {
-        return new DBPort(serverAddress, provider, options, generation);
+        return new DBPort(serverAddress, provider, mongo, generation);
     }
 }

src/main/com/mongodb/DefaultClusterableServerFactory.java

@@ -42,7 +42,7 @@ public ClusterableServer create(final ServerAddress serverAddress) {
                               .maxWaitTime(options.getMaxWaitTime(), MILLISECONDS)
                               .build();
         return new DefaultServer(serverAddress, settings, clusterId,
-                                 new PooledConnectionProvider(clusterId, serverAddress, new DBPortFactory(options), connectionPoolSettings,
+                                 new PooledConnectionProvider(clusterId, serverAddress, new DBPortFactory(mongo), connectionPoolSettings,
                                                               new JMXConnectionPoolListener(mongo.getMongoOptions().getDescription())),
                                  mongo);
     }

src/main/com/mongodb/ServerMonitor.java

@@ -85,7 +85,7 @@ public void run() {
                     Throwable previousException = currentException;
                     try {
                         if (connection == null) {
-                            connection = new DBPort(serverAddress, null, getOptions(), 0);
+                            connection = new DBPort(serverAddress, getOptions());
                         }
                         try {
                             currentServerDescription = lookupServerDescription(connection);
@@ -99,7 +99,7 @@ public void run() {
                                 connection = null;
                                 connectionProvider.invalidate();
                             }
-                            connection = new DBPort(serverAddress, null, getOptions(), 0);
+                            connection = new DBPort(serverAddress, getOptions());
                             try {
                                 currentServerDescription = lookupServerDescription(connection);
                             } catch (IOException e1) {
@@ -263,7 +263,7 @@ private ServerDescription createDescription(final CommandResult commandResult, f
     }
 
     @SuppressWarnings("unchecked")
-    private static ServerVersion getVersion(final CommandResult buildInfoResult) {
+    static ServerVersion getVersion(final CommandResult buildInfoResult) {
         return new ServerVersion(((List<Integer>) buildInfoResult.get("versionArray")).subList(0, 3));
     }
 

src/test/com/mongodb/DBPortTest.java

@@ -42,7 +42,7 @@ public void testAuthentication() throws IOException {
             db1.addUser("u1", "e".toCharArray());
             db2.addUser("u2", "e".toCharArray());
 
-            DBPort port = new DBPort(m.getAddress());
+            DBPort port = new DBPort(m.getAddress(), null, m, 0);
             port.checkAuth(m);
 
             Set<String> expected = new HashSet<String>();

src/test/com/mongodb/ServerMonitorSpecification.groovy

@@ -135,7 +135,7 @@ class ServerMonitorSpecification extends FunctionalSpecification {
     def initializeServerMonitor(ServerAddress address) {
         def options = new MongoOptions()
         options.connectTimeout = 1000
-        def connectionProvider = new PooledConnectionProvider('cluster-1', address, new DBPortFactory(options),
+        def connectionProvider = new PooledConnectionProvider('cluster-1', address, new DBPortFactory(getMongoClient()),
                                                               ConnectionPoolSettings.builder().maxSize(1).build(),
                                                               new JMXConnectionPoolListener());
         serverMonitor = new ServerMonitor(address,