From b166e13d2be906ea24810c170c1f410655ef3ab1 Mon Sep 17 00:00:00 2001
From: Jihoon Son <jihoonson@apache.org>
Date: Wed, 5 Apr 2017 05:58:32 +0900
Subject: [PATCH] Make DruidCoordinatorTest fail fast (#4142)

---
 .../coordinator/DruidCoordinatorTest.java     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
index d48420d6756..1a523488187 100644
--- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
+++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java
@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;
 import com.google.common.collect.Maps;
-
 import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.ImmutableDruidDataSource;
@@ -77,7 +76,6 @@ import java.util.concurrent.atomic.AtomicReference;
 public class DruidCoordinatorTest extends CuratorTestBase
 {
   private DruidCoordinator coordinator;
-  private LoadQueueTaskMaster taskMaster;
   private MetadataSegmentManager databaseSegmentManager;
   private SingleServerInventoryView serverInventoryView;
   private ScheduledExecutorFactory scheduledExecutorFactory;
@@ -101,7 +99,6 @@ public class DruidCoordinatorTest extends CuratorTestBase
   @Before
   public void setUp() throws Exception
   {
-    taskMaster = EasyMock.createMock(LoadQueueTaskMaster.class);
     druidServer = EasyMock.createMock(DruidServer.class);
     serverInventoryView = EasyMock.createMock(SingleServerInventoryView.class);
     databaseSegmentManager = EasyMock.createNiceMock(MetadataSegmentManager.class);
@@ -174,7 +171,7 @@ public class DruidCoordinatorTest extends CuratorTestBase
         new NoopServiceEmitter(),
         scheduledExecutorFactory,
         null,
-        taskMaster,
+        null,
         new NoopServiceAnnouncer(){
           @Override
           public void announce(DruidNode node)
@@ -328,10 +325,14 @@ public class DruidCoordinatorTest extends CuratorTestBase
         ) throws Exception
         {
           if(pathChildrenCacheEvent.getType().equals(PathChildrenCacheEvent.Type.CHILD_ADDED)){
-            //Coordinator should try to assign segment to druidServer historical
-            //Simulate historical loading segment
-            druidServer.addDataSegment(dataSegment.getIdentifier(), dataSegment);
-            assignSegmentLatch.countDown();
+            if (assignSegmentLatch.getCount() > 0) {
+              //Coordinator should try to assign segment to druidServer historical
+              //Simulate historical loading segment
+              druidServer.addDataSegment(dataSegment.getIdentifier(), dataSegment);
+              assignSegmentLatch.countDown();
+            } else {
+              Assert.fail("The same segment is assigned to the same server multiple times");
+            }
           }
         }
       }
@@ -371,9 +372,7 @@ public class DruidCoordinatorTest extends CuratorTestBase
     Assert.assertNotNull(dataSourceMap.get(dataSource));
     // Simulated the adding of segment to druidServer during SegmentChangeRequestLoad event
     // The load rules asks for 2 replicas, therefore 1 replica should still be pending
-    while(dataSourceMap.get(dataSource).get() != 1L) {
-      Thread.sleep(50);
-    }
+    Assert.assertEquals(1L, dataSourceMap.get(dataSource).get());
 
     coordinator.stop();
     leaderUnannouncerLatch.await();