[ignite] branch master updated: IGNITE-10218 Detecting lost partitions PME phase triggered twice on coordinator

[irakov]

This is an automated email from the ASF dual-hosted git repository.

irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c6d4ce  IGNITE-10218 Detecting lost partitions PME phase triggered 
twice on coordinator
4c6d4ce is described below

commit 4c6d4cefc9ca3bc96036015418412a281bd58789
Author: denis-chudov <regmoongl...@gmail.com>
AuthorDate: Fri Jul 5 16:41:25 2019 +0300

    IGNITE-10218 Detecting lost partitions PME phase triggered twice on 
coordinator
    
    Signed-off-by: Ivan Rakov <ira...@apache.org>
---
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 1e4451a..672fa01 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -2207,7 +2207,7 @@ public class GridDhtPartitionsExchangeFuture extends 
GridDhtTopologyFutureAdapte
                     }
                 }
 
-                if (serverNodeDiscoveryEvent() || localJoinExchange())
+                if (!crd.isLocal() && (serverNodeDiscoveryEvent() || 
localJoinExchange()))
                     detectLostPartitions(res);
 
                 Map<Integer, CacheGroupValidation> m = 
U.newHashMap(cctx.cache().cacheGroups().size());
@@ -3477,8 +3477,10 @@ public class GridDhtPartitionsExchangeFuture extends 
GridDhtTopologyFutureAdapte
                     && 
((SnapshotDiscoveryMessage)discoveryCustomMessage).needAssignPartitions())
                     assignPartitionsStates();
             }
-            else if (exchCtx.events().hasServerJoin())
-                assignPartitionsStates();
+            else {
+                if (exchCtx.events().hasServerJoin())
+                    assignPartitionsStates();
+            }
 
             // Recalculate new affinity based on partitions availability.
             if (!exchCtx.mergeExchanges() && forceAffReassignment) {