fix Intermittent test failure in BrokerServiceThrottlingTest (#280)

apache · Mar 7, 2017 · fbdbddd · fbdbddd
1 parent ea85d95
commit fbdbddd
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BrokerServiceThrottlingTest.java b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/service/BrokerServiceThrottlingTest.java
@@ -249,8 +249,15 @@ public void testLookupThrottlingForClientByBrokerInternalRetry() throws Exceptio
         stopBroker();
         conf.setMaxConcurrentLookupRequest(1);
         startBroker();
-        // wait for consumer to reconnect
-        Thread.sleep(3000);
+
+        // wait strategically for all consumers to reconnect
+        for (int i = 0; i < 5; i++) {
+            if (!areAllConsumersConnected(consumers)) {
+                Thread.sleep(1000 + (i * 500));
+            } else {
+                break;
+            }
+        }
 
         int totalConnectedConsumers = 0;
         for (int i = 0; i < consumers.size(); i++) {
@@ -265,6 +272,15 @@ public void testLookupThrottlingForClientByBrokerInternalRetry() throws Exceptio
         pulsarClient.close();
     }
 
+    private boolean areAllConsumersConnected(List<Consumer> consumers) {
+        for (int i = 0; i < consumers.size(); i++) {
+            if (!((ConsumerImpl) consumers.get(i)).isConnected()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private void upsertLookupPermits(int permits) throws Exception {
         Map<String, String> throttlingMap = Maps.newHashMap();
         throttlingMap.put("maxConcurrentLookupRequest", Integer.toString(permits));