[GitHub] [ignite-3] SammyVimes commented on a change in pull request #126: IGNITE-14707

[GitBox <gi...@apache.org>]

SammyVimes commented on a change in pull request #126:
URL: https://github.com/apache/ignite-3/pull/126#discussion_r631765180



##########
File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeTopologyService.java
##########
@@ -36,13 +34,13 @@
     private ClusterNode localMember;
 
     /** Topology members. */
-    private final Map<String, ClusterNode> members = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, ClusterNode> members = new ConcurrentHashMap<>();

Review comment:
       ```suggestion
       private final ConcurrentMap<String, ClusterNode> members = new ConcurrentHashMap<>();
   ```

##########
File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeTopologyService.java
##########
@@ -36,13 +34,13 @@
     private ClusterNode localMember;
 
     /** Topology members. */
-    private final Map<String, ClusterNode> members = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, ClusterNode> members = new ConcurrentHashMap<>();
 
     /**
      * Sets the ScaleCube's local {@link Member}.
      */
     void setLocalMember(Member member) {
-        localMember = fromMember(member);
+        this.localMember = fromMember(member);

Review comment:
       isn't `this` odd here?

##########
File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeTopologyService.java
##########
@@ -54,37 +52,16 @@ void setLocalMember(Member member) {
     void onMembershipEvent(MembershipEvent event) {
         ClusterNode member = fromMember(event.member());
 
-        String memberName = member.name();
-
-        switch (event.type()) {
-            case ADDED:
-                members.put(memberName, member);
-
-                fireAppearedEvent(member);
-
-                break;
-
-            case LEAVING:
-                members.remove(memberName);
-
-                fireDisappearedEvent(member);
+        if (event.isAdded()) {

Review comment:
       what about `LEAVING` event?

##########
File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeTopologyService.java
##########
@@ -54,37 +52,16 @@ void setLocalMember(Member member) {
     void onMembershipEvent(MembershipEvent event) {
         ClusterNode member = fromMember(event.member());
 
-        String memberName = member.name();
-
-        switch (event.type()) {
-            case ADDED:
-                members.put(memberName, member);
-
-                fireAppearedEvent(member);
-
-                break;
-
-            case LEAVING:
-                members.remove(memberName);
-
-                fireDisappearedEvent(member);
+        if (event.isAdded()) {
+            this.members.put(member.address(), member);
 
-                break;
-
-            case REMOVED:
-                // In case if member left non-gracefully, without sending LEAVING event.
-                if (members.remove(memberName) != null)
-                    fireDisappearedEvent(member);
-
-                break;
-
-            case UPDATED:
-                // No-op.
-                break;
-
-            default:
-                throw new IgniteInternalException("This event is not supported: event = " + event);
+            fireAppearedEvent(member);
+        }
+        else if (event.isRemoved()) {
+            this.members.compute(member.address(), // Ignore stale remove event.
+                (k, v) -> v.id().equals(member.id()) ? null : v);
 
+            fireDisappearedEvent(member);

Review comment:
       I guess this should not be called if the event is stale




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org