IGNITE-20553 Add await self in local logical topology logic to node startup procedure #3220
Conversation
…-20553 # Conflicts: # modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ActiveActorTest.java
sanpwc
changed the title
…edByAnotherNodesAlready
| /** | ||
| * Retrieves the current logical topology snapshot stored in the local storage. | ||
| */ | ||
| LogicalTopologySnapshot getLogicalTopology(); |
There was a problem hiding this comment.
Does it make sense to reflect it in the name of the method that the topology is returned based on the local view of the node? Like localLogicalTopology().
Also, get prefix does not match the style of logicalTopologyOnLeader(): they should both have get prefix, or none of them should have it.
There was a problem hiding this comment.
Agee. I've used the mehod naming from internals, but you proposal looks reasonable.
| LogicalTopologyEventListener awaitSelfListener = new LogicalTopologyEventListener() { | ||
| @Override | ||
| public void onNodeJoined(LogicalNode joinedNode, LogicalTopologySnapshot newTopology) { | ||
| if (newTopology.nodes().stream().map(LogicalNode::id).collect(Collectors.toSet()).contains(id())) { |
There was a problem hiding this comment.
If toSet is imported statically, this will read nicely in plain English: 'collect to set'
| @@ -990,6 +994,37 @@ public CompletableFuture<Ignite> start(Path configPath) { | |||
|
|
|||
| return cmgMgr.onJoinReady(); | |||
| }, startupExecutor) | |||
| .thenComposeAsync(ignored -> { | |||
| CompletableFuture<Void> awaitSelfInLogicalTopologyFuture = new CompletableFuture<>(); | |||
There was a problem hiding this comment.
Is it possible to extract this as a method? The method in which this code is defined is already huge.
|
|
||
| @Override | ||
| public void onTopologyLeap(LogicalTopologySnapshot newTopology) { | ||
| if (newTopology.nodes().stream().map(LogicalNode::id).collect(Collectors.toSet()).contains(id())) { |
There was a problem hiding this comment.
It seems like there are 3 duplicates of this code, it it possible to extract them to methods?
There was a problem hiding this comment.
Don't think that it's really needed, taking into considiration that everething inside thenCompose will be extracted I'd rather left inner duplication as is. However if you will intend I'll also add a private helper for this.
There was a problem hiding this comment.
Ok, will add inner method.
https://issues.apache.org/jira/browse/IGNITE-20553