svn commit: r1706247 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java

[js...@apache.org]

Author: jsedding
Date: Thu Oct  1 13:33:54 2015
New Revision: 1706247

URL: http://svn.apache.org/viewvc?rev=1706247&view=rev
Log:
OAK-3467 - Tests slow after OAK-2171

- applied patch from Tomek Rękawek with minor modifications, thanks!

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java?rev=1706247&r1=1706246&r2=1706247&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java Thu Oct  1 13:33:54 2015
@@ -32,6 +32,8 @@ import com.mongodb.MongoClientURI;
 
 public class MongoNodeStoreContainer implements NodeStoreContainer {
 
+    private static Boolean mongoAvailable;
+
     private static final Logger LOG = LoggerFactory.getLogger(MongoNodeStoreContainer.class);
 
     private static final String MONGO_URI = System.getProperty("oak.mongo.uri",
@@ -60,9 +62,18 @@ public class MongoNodeStoreContainer imp
     }
 
     public static boolean isMongoAvailable() {
+        if (mongoAvailable != null) {
+            return mongoAvailable;
+        }
+
+        mongoAvailable = testMongoAvailability();
+        return mongoAvailable;
+    }
+
+    private static boolean testMongoAvailability() {
         Mongo mongo = null;
         try {
-            MongoClientURI uri = new MongoClientURI(MONGO_URI);
+            MongoClientURI uri = new MongoClientURI(MONGO_URI + "?connectTimeoutMS=3000");
             mongo = new MongoClient(uri);
             mongo.getDatabaseNames();
             return true;