ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-5578
Date Mon, 21 Aug 2017 09:44:35 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 b3cf893c5 -> da8fac0c6


ignite-5578


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da8fac0c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da8fac0c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da8fac0c

Branch: refs/heads/ignite-5578
Commit: da8fac0c6cf73d8d7fb5847328476851d3527090
Parents: b3cf893
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Aug 21 12:44:28 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Aug 21 12:44:28 2017 +0300

----------------------------------------------------------------------
 .../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
 .../processors/cache/distributed/CacheExchangeMergeTest.java       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/da8fac0c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
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 07f36af..ca6ee5e 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
@@ -1387,7 +1387,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
 
     /** {@inheritDoc} */
     @Override public boolean onDone(@Nullable AffinityTopologyVersion res, @Nullable Throwable
err) {
-        if (!done.compareAndSet(false, true))
+        if (isDone() || !done.compareAndSet(false, true))
             return false;
 
         log.info("Finish exchange future [startVer=" + initialVersion() +

http://git-wip-us.apache.org/repos/asf/ignite/blob/da8fac0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
index fcb5276..f93d60c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
@@ -200,8 +200,6 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest {
         return ccfg;
     }
 
-    // TODO IGNITE-5578 joined merged node failed (client/server).
-
     /**
      * @throws Exception If failed.
      */


Mime
View raw message