Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove ServerDiscoverySelector i.e. hardcoded zk dependency from DruidLeaderClient #10537

Merged
merged 1 commit into from
Oct 28, 2020
Merged

remove ServerDiscoverySelector i.e. hardcoded zk dependency from DruidLeaderClient #10537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions server/src/main/java/org/apache/druid/discovery/DruidLeaderClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import org.apache.druid.client.selector.DiscoverySelector;
import org.apache.druid.client.selector.Server;
import org.apache.druid.concurrent.LifecycleLock;
import org.apache.druid.java.util.common.IOE;
import org.apache.druid.java.util.common.ISE;
Expand Down Expand Up @@ -71,9 +69,6 @@ public class DruidLeaderClient

private final String leaderRequestPath;

//Note: This is kept for back compatibility with pre 0.11.0 releases and should be removed in future.
private final DiscoverySelector<Server> serverDiscoverySelector;

private LifecycleLock lifecycleLock = new LifecycleLock();
private DruidNodeDiscovery druidNodeDiscovery;
private AtomicReference<String> currentKnownLeader = new AtomicReference<>();
Expand All @@ -82,15 +77,13 @@ public DruidLeaderClient(
HttpClient httpClient,
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider,
NodeRole nodeRoleToWatch,
String leaderRequestPath,
DiscoverySelector<Server> serverDiscoverySelector
String leaderRequestPath
)
{
this.httpClient = httpClient;
this.druidNodeDiscoveryProvider = druidNodeDiscoveryProvider;
this.nodeRoleToWatch = nodeRoleToWatch;
this.leaderRequestPath = leaderRequestPath;
this.serverDiscoverySelector = serverDiscoverySelector;
}

@LifecycleStart
Expand Down Expand Up @@ -280,16 +273,6 @@ private String getCurrentKnownLeader(final boolean cached) throws IOException
@Nullable
private String pickOneHost()
{
Server server = serverDiscoverySelector.pick();
if (server != null) {
return StringUtils.format(
"%s://%s:%s",
server.getScheme(),
server.getAddress(),
server.getPort()
);
}

Iterator<DiscoveryDruidNode> iter = druidNodeDiscovery.getAllNodes().iterator();
if (iter.hasNext()) {
DiscoveryDruidNode node = iter.next();
Expand Down
19 changes: 2 additions & 17 deletions server/src/main/java/org/apache/druid/guice/CoordinatorDiscoveryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import com.google.inject.Provides;
import org.apache.druid.client.coordinator.Coordinator;
import org.apache.druid.client.coordinator.CoordinatorSelectorConfig;
import org.apache.druid.curator.discovery.ServerDiscoveryFactory;
import org.apache.druid.curator.discovery.ServerDiscoverySelector;
import org.apache.druid.discovery.DruidLeaderClient;
import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
import org.apache.druid.discovery.NodeRole;
Expand All @@ -42,32 +40,19 @@ public void configure(Binder binder)
JsonConfigProvider.bind(binder, "druid.selectors.coordinator", CoordinatorSelectorConfig.class);
}

@Provides
@Coordinator
@ManageLifecycle
public ServerDiscoverySelector getServiceProvider(
CoordinatorSelectorConfig config,
ServerDiscoveryFactory serverDiscoveryFactory
)
{
return serverDiscoveryFactory.createSelector(config.getServiceName());
}

@Provides
@Coordinator
@ManageLifecycle
public DruidLeaderClient getLeaderHttpClient(
@EscalatedGlobal HttpClient httpClient,
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider,
@Coordinator ServerDiscoverySelector serverDiscoverySelector
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider
)
{
return new DruidLeaderClient(
httpClient,
druidNodeDiscoveryProvider,
NodeRole.COORDINATOR,
"/druid/coordinator/v1/leader",
serverDiscoverySelector
"/druid/coordinator/v1/leader"
);
}
}
19 changes: 2 additions & 17 deletions server/src/main/java/org/apache/druid/guice/IndexingServiceDiscoveryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import com.google.inject.Provides;
import org.apache.druid.client.indexing.IndexingService;
import org.apache.druid.client.indexing.IndexingServiceSelectorConfig;
import org.apache.druid.curator.discovery.ServerDiscoveryFactory;
import org.apache.druid.curator.discovery.ServerDiscoverySelector;
import org.apache.druid.discovery.DruidLeaderClient;
import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
import org.apache.druid.discovery.NodeRole;
Expand All @@ -42,32 +40,19 @@ public void configure(Binder binder)
JsonConfigProvider.bind(binder, "druid.selectors.indexing", IndexingServiceSelectorConfig.class);
}

@Provides
@IndexingService
@ManageLifecycle
public ServerDiscoverySelector getServiceProvider(
IndexingServiceSelectorConfig config,
ServerDiscoveryFactory serverDiscoveryFactory
)
{
return serverDiscoveryFactory.createSelector(config.getServiceName());
}

@Provides
@IndexingService
@ManageLifecycle
public DruidLeaderClient getLeaderHttpClient(
@EscalatedGlobal HttpClient httpClient,
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider,
@IndexingService ServerDiscoverySelector serverDiscoverySelector
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider
)
{
return new DruidLeaderClient(
httpClient,
druidNodeDiscoveryProvider,
NodeRole.OVERLORD,
"/druid/indexer/v1/leader",
serverDiscoverySelector
"/druid/indexer/v1/leader"
);
}
}
21 changes: 6 additions & 15 deletions server/src/test/java/org/apache/druid/discovery/DruidLeaderClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.google.inject.name.Named;
import com.google.inject.name.Names;
import com.google.inject.servlet.GuiceFilter;
import org.apache.druid.curator.discovery.ServerDiscoverySelector;
import org.apache.druid.guice.GuiceInjectors;
import org.apache.druid.guice.Jerseys;
import org.apache.druid.guice.JsonConfigProvider;
Expand Down Expand Up @@ -123,8 +122,7 @@ public void testSimple() throws Exception
httpClient,
druidNodeDiscoveryProvider,
NodeRole.PEON,
"/simple/leader",
EasyMock.createNiceMock(ServerDiscoverySelector.class)
"/simple/leader"
);
druidLeaderClient.start();

Expand All @@ -148,8 +146,7 @@ public void testNoLeaderFound() throws Exception
httpClient,
druidNodeDiscoveryProvider,
NodeRole.PEON,
"/simple/leader",
EasyMock.createNiceMock(ServerDiscoverySelector.class)
"/simple/leader"
);
druidLeaderClient.start();

Expand All @@ -175,8 +172,7 @@ public void testRedirection() throws Exception
httpClient,
druidNodeDiscoveryProvider,
NodeRole.PEON,
"/simple/leader",
EasyMock.createNiceMock(ServerDiscoverySelector.class)
"/simple/leader"
);
druidLeaderClient.start();

Expand All @@ -188,9 +184,6 @@ public void testRedirection() throws Exception
@Test
public void testServerFailureAndRedirect() throws Exception
{
ServerDiscoverySelector serverDiscoverySelector = EasyMock.createMock(ServerDiscoverySelector.class);
EasyMock.expect(serverDiscoverySelector.pick()).andReturn(null).anyTimes();

DruidNodeDiscovery druidNodeDiscovery = EasyMock.createMock(DruidNodeDiscovery.class);
DiscoveryDruidNode dummyNode = new DiscoveryDruidNode(
new DruidNode("test", "dummyhost", false, 64231, null, true, false),
Expand All @@ -203,14 +196,13 @@ public void testServerFailureAndRedirect() throws Exception
DruidNodeDiscoveryProvider druidNodeDiscoveryProvider = EasyMock.createMock(DruidNodeDiscoveryProvider.class);
EasyMock.expect(druidNodeDiscoveryProvider.getForNodeRole(NodeRole.PEON)).andReturn(druidNodeDiscovery).anyTimes();

EasyMock.replay(serverDiscoverySelector, druidNodeDiscovery, druidNodeDiscoveryProvider);
EasyMock.replay(druidNodeDiscovery, druidNodeDiscoveryProvider);

DruidLeaderClient druidLeaderClient = new DruidLeaderClient(
httpClient,
druidNodeDiscoveryProvider,
NodeRole.PEON,
"/simple/leader",
serverDiscoverySelector
"/simple/leader"
);
druidLeaderClient.start();

Expand All @@ -236,8 +228,7 @@ public void testFindCurrentLeader()
httpClient,
druidNodeDiscoveryProvider,
NodeRole.PEON,
"/simple/leader",
EasyMock.createNiceMock(ServerDiscoverySelector.class)
"/simple/leader"
);
druidLeaderClient.start();

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ private class TestDruidLeaderClient extends DruidLeaderClient

private TestDruidLeaderClient(ObjectMapper jsonMapper)
{
super(null, new TestNodeDiscoveryProvider(), null, null, null);
super(null, new TestNodeDiscoveryProvider(), null, null);
this.jsonMapper = jsonMapper;
}

Expand Down
5 changes: 1 addition & 4 deletions sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,7 @@ NodeRole.COORDINATOR, new FakeDruidNodeDiscovery(ImmutableMap.of(NodeRole.COORDI
new FakeHttpClient(),
provider,
NodeRole.COORDINATOR,
"/simple/leader",
() -> {
throw new UnsupportedOperationException();
}
"/simple/leader"
);

return new SystemSchema(
Expand Down