A fresh attempt to fix jenkins race condition

joaquincasares · joaquincasares · commit 6846ce2b788b · 2013-08-05T14:56:10.000-05:00
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
@@ -292,22 +292,37 @@ public static CCMCluster create(int nbNodes, Cluster.Builder builder) {
             if (nbNodes == 0)
                 throw new IllegalArgumentException();
 
-            return new CCMCluster(CCMBridge.create("test", nbNodes), builder);
+            return new CCMCluster(CCMBridge.create("test", nbNodes), builder, nbNodes);
         }
 
         public static CCMCluster create(int nbNodesDC1, int nbNodesDC2, Cluster.Builder builder) {
             if (nbNodesDC1 == 0)
                 throw new IllegalArgumentException();
 
-            return new CCMCluster(CCMBridge.create("test", nbNodesDC1, nbNodesDC2), builder);
+            return new CCMCluster(CCMBridge.create("test", nbNodesDC1, nbNodesDC2), builder, nbNodesDC1 + nbNodesDC2);
         }
 
-        private CCMCluster(CCMBridge cassandraCluster, Cluster.Builder builder) {
+        private CCMCluster(CCMBridge cassandraCluster, Cluster.Builder builder, int totalNodes) {
             this.cassandraCluster = cassandraCluster;
             try {
                 this.cluster = builder.addContactPoints(IP_PREFIX + "1").build();
                 this.session = cluster.connect();
 
+                Session tmpSession = cluster.connect();
+
+                int maxTry = 30;
+                for (int i = 0; i < maxTry; ++i) {
+                    List<Row> rs = tmpSession.execute("SELECT * from system.peers").all();
+                    if (rs.size() == totalNodes - 1) {
+                        break;
+                    }
+                    try { Thread.sleep(1000); } catch (Exception e) {}
+
+                    if (i == maxTry - 1) {
+                        throw new RuntimeException("Not all nodes came online.");
+                    }
+                }
+
             } catch (NoHostAvailableException e) {
                 for (Map.Entry<InetAddress, String> entry : e.getErrors().entrySet())
                     logger.info("Error connecting to " + entry.getKey() + ": " + entry.getValue());
diff --git a/driver-core/src/test/java/com/datastax/driver/core/TestUtils.java b/driver-core/src/test/java/com/datastax/driver/core/TestUtils.java
@@ -256,19 +256,19 @@ public static Object getFixedValue2(final DataType type) {
     // This is used because there is some delay between when a node has been
     // added through ccm and when it's actually available for querying
     public static void waitFor(String node, Cluster cluster) {
-        waitFor(node, cluster, 20, false, false);
+        waitFor(node, cluster, 30, false, false);
     }
 
     public static void waitFor(String node, Cluster cluster, int maxTry) {
         waitFor(node, cluster, maxTry, false, false);
     }
 
     public static void waitForDown(String node, Cluster cluster) {
-        waitFor(node, cluster, 20, true, false);
+        waitFor(node, cluster, 30, true, false);
     }
 
     public static void waitForDownWithWait(String node, Cluster cluster, int waitTime) {
-        waitFor(node, cluster, 20, true, false);
+        waitFor(node, cluster, 30, true, false);
 
         // FIXME: Once stop() works, remove this line
         try {
@@ -283,7 +283,7 @@ public static void waitForDown(String node, Cluster cluster, int maxTry) {
     }
 
     public static void waitForDecommission(String node, Cluster cluster) {
-        waitFor(node, cluster, 20, true, true);
+        waitFor(node, cluster, 30, true, true);
     }
 
     public static void waitForDecommission(String node, Cluster cluster, int maxTry) {

Original file line number	Diff line number	Diff line change
`@@ -256,19 +256,19 @@ public static Object getFixedValue2(final DataType type) {`
`256`	`256`	`// This is used because there is some delay between when a node has been`
`257`	`257`	`// added through ccm and when it's actually available for querying`
`258`	`258`	`public static void waitFor(String node, Cluster cluster) {`
`259`		`- waitFor(node, cluster, 20, false, false);`
	`259`	`+ waitFor(node, cluster, 30, false, false);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`public static void waitFor(String node, Cluster cluster, int maxTry) {`
`263`	`263`	`waitFor(node, cluster, maxTry, false, false);`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`public static void waitForDown(String node, Cluster cluster) {`
`267`		`- waitFor(node, cluster, 20, true, false);`
	`267`	`+ waitFor(node, cluster, 30, true, false);`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`public static void waitForDownWithWait(String node, Cluster cluster, int waitTime) {`
`271`		`- waitFor(node, cluster, 20, true, false);`
	`271`	`+ waitFor(node, cluster, 30, true, false);`
`272`	`272`
`273`	`273`	`// FIXME: Once stop() works, remove this line`
`274`	`274`	`try {`
`@@ -283,7 +283,7 @@ public static void waitForDown(String node, Cluster cluster, int maxTry) {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`public static void waitForDecommission(String node, Cluster cluster) {`
`286`		`- waitFor(node, cluster, 20, true, true);`
	`286`	`+ waitFor(node, cluster, 30, true, true);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`public static void waitForDecommission(String node, Cluster cluster, int maxTry) {`