[ignite] branch master updated: Revert "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 d7ac5ef  Revert "IGNITE-10218 Detecting lost partitions PME phase 
triggered twice on coordinator"
d7ac5ef is described below

commit d7ac5ef7653b61497fcec887387855d352772bd3
Author: Ivan Rakov <ira...@apache.org>
AuthorDate: Fri Jul 5 16:46:03 2019 +0300

    Revert "IGNITE-10218 Detecting lost partitions PME phase triggered twice on 
coordinator"
---
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java            | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 672fa01..1e4451a 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 (!crd.isLocal() && (serverNodeDiscoveryEvent() || 
localJoinExchange()))
+                if (serverNodeDiscoveryEvent() || localJoinExchange())
                     detectLostPartitions(res);
 
                 Map<Integer, CacheGroupValidation> m = 
U.newHashMap(cctx.cache().cacheGroups().size());
@@ -3477,10 +3477,8 @@ 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) {