leventov commented on a change in pull request #6606: Simplify
DruidNodeDiscoveryProvider; add
DruidNodeDiscovery.Listener.nodeViewInitialized()
URL: https://github.com/apache/incubator-druid/pull/6606#discussion_r237581659
##########
File path:
server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
##########
@@ -139,45 +150,39 @@ public void nodesAdded(List<DiscoveryDruidNode>
nodesDiscovered)
}
}
- ImmutableList<DiscoveryDruidNode> newNodesAdded = null;
- if (uninitializedNodeTypeListeners.isEmpty()) {
- newNodesAdded = builder.build();
- } else if (uninitializedNodeTypeListeners.remove(this) &&
uninitializedNodeTypeListeners.isEmpty()) {
- newNodesAdded = ImmutableList.copyOf(nodes.values());
- }
-
- if (newNodesAdded != null) {
+ if (!nodesAdded.isEmpty()) {
+ Collection<DiscoveryDruidNode> unmodifiableNodesAdded =
Collections.unmodifiableCollection(nodesAdded);
for (Listener listener : listeners) {
try {
- listener.nodesAdded(newNodesAdded);
+ listener.nodesAdded(unmodifiableNodesAdded);
}
catch (Exception ex) {
- log.error(ex, "Listener[%s].nodesAdded(%s) threw exception.
Ignored.", listener, newNodesAdded);
+ log.error(ex, "Listener[%s].nodesAdded(%s) threw exception.
Ignored.", listener, nodesAdded);
}
}
}
}
}
@Override
- public void nodesRemoved(List<DiscoveryDruidNode> nodesDisappeared)
+ public void nodesRemoved(Collection<DiscoveryDruidNode> nodesDisappeared)
{
synchronized (lock) {
- ImmutableList.Builder<DiscoveryDruidNode> builder =
ImmutableList.builder();
+ List<DiscoveryDruidNode> nodesRemoved = new ArrayList<>();
for (DiscoveryDruidNode node : nodesDisappeared) {
DiscoveryDruidNode prev =
nodes.remove(node.getDruidNode().getHostAndPortToUse());
if (prev != null) {
- builder.add(node);
+ nodesRemoved.add(node);
} else {
log.warn("Node[%s] disappeared but was unknown for service
listener [%s].", node, service);
}
}
- if (uninitializedNodeTypeListeners.isEmpty()) {
- ImmutableList<DiscoveryDruidNode> nodesRemoved = builder.build();
+ if (!nodesRemoved.isEmpty()) {
Review comment:
No, there was no mistake. nodesRemoved were not reported to listeners before
full initialization, but the changes were still accumulated in `nodes`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
