OGM-827 Setting the mongodb timeout for tests to 1000ms and removing …

…retry logic in MongoDBDatastoreProvider
hibernate · May 29, 2015 · 2fdfcf2 · 2fdfcf2
1 parent 047edd6
commit 2fdfcf2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/impl/MongoDBDatastoreProvider.java b/mongodb/src/main/java/org/hibernate/ogm/datastore/mongodb/impl/MongoDBDatastoreProvider.java
@@ -35,7 +35,6 @@
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoException;
-import com.mongodb.MongoTimeoutException;
 import com.mongodb.ServerAddress;
 
 /**
@@ -181,21 +180,7 @@ private DB extractDatabase(MongoClient mongo, MongoDBConfiguration config) {
 			if ( containsDatabase == null ) {
 				// force a connection to make sure we do have read access
 				// otherwise the connection failure happens during the first flush
-				int retries = 0;
-				while (true) {
-					try {
-						db.collectionExists( "WeDoNotCareWhatItIsWeNeedToConnect" );
-						break;
-					}
-					catch (MongoTimeoutException me) {
-						// unless we retry twice, the second access will be a TimeoutException error instead of an auth error
-						// This is a workaround for https://jira.mongodb.org/browse/JAVA-1803
-						retries++;
-						if ( retries > 2 ) {
-							throw me;
-						}
-					}
-				}
+				db.collectionExists( "WeDoNotCareWhatItIsWeNeedToConnect" );
 			}
 			return mongo.getDB( databaseName );
 		}

diff --git a/mongodb/src/test/resources/hibernate.properties b/mongodb/src/test/resources/hibernate.properties
@@ -9,5 +9,4 @@ hibernate.ogm.datastore.provider = ${datastoreProvider}
 hibernate.ogm.datastore.database = ogm_test_database
 hibernate.ogm.datastore.create_database=true
 
-#set timeout at 200 milliseconds
-hibernate.ogm.mongodb.connection_timeout = 200
+hibernate.ogm.mongodb.connection_timeout = 1000