From ce0049d8ff98e9c0b21a35a92039af2de3540422 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Sun, 8 Jan 2017 23:06:05 -0800 Subject: [PATCH] DruidCoordinator: Leave the ServerInventoryView running when we lose leadership. (#3830) --- .../java/io/druid/server/coordinator/DruidCoordinator.java | 2 -- .../io/druid/server/coordinator/DruidCoordinatorTest.java | 6 ------ 2 files changed, 8 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java index 8d2625db84f..bdba9f4981f 100644 --- a/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java +++ b/server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java @@ -553,7 +553,6 @@ public class DruidCoordinator leader = true; metadataSegmentManager.start(); metadataRuleManager.start(); - serverInventoryView.start(); serviceAnnouncer.announce(self); final int startingLeaderCounter = leaderCounter; @@ -635,7 +634,6 @@ public class DruidCoordinator loadManagementPeons.clear(); serviceAnnouncer.unannounce(self); - serverInventoryView.stop(); metadataRuleManager.stop(); metadataSegmentManager.stop(); leader = false; 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 f9d8cadb0a2..ca22bf61b92 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java +++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorTest.java @@ -304,13 +304,7 @@ public class DruidCoordinatorTest extends CuratorTestBase EasyMock.expect(serverInventoryView.getInventory()).andReturn( ImmutableList.of(druidServer) ).atLeastOnce(); - serverInventoryView.start(); - EasyMock.expectLastCall().atLeastOnce(); EasyMock.expect(serverInventoryView.isStarted()).andReturn(true).anyTimes(); - - serverInventoryView.stop(); - EasyMock.expectLastCall().once(); - EasyMock.replay(serverInventoryView); coordinator.start();