You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/30 17:25:17 UTC
[07/34] ignite git commit: ignite-3477-master fix failover test (lost
partition), and skip exception on node stopping
ignite-3477-master fix failover test (lost partition), and skip exception on node stopping
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c6a9a30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c6a9a30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c6a9a30
Branch: refs/heads/ignite-3477-master
Commit: 6c6a9a3082dc350ce805c2bc9d6eeb48dd93a3f6
Parents: b3f953a
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Mar 29 15:27:35 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Mar 29 15:27:35 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 5 +++++
.../processors/cache/GridCacheAbstractFailoverSelfTest.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c6a9a30/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index bc1c584..cfeb9d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3201,6 +3201,11 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
}
}
+ catch (NodeStoppingException e){
+ U.error(log, "Failed to update key:" + key + " on backup, node stopping", e);
+
+ return;
+ }
catch (GridDhtInvalidPartitionException ignored) {
// Ignore.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c6a9a30/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
index 09a0d9a..fa4ffca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java
@@ -23,6 +23,7 @@ import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePartialUpdateException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -97,6 +98,9 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac
cfg.setRebalanceMode(SYNC);
+ if (cfg.getCacheMode() == CacheMode.PARTITIONED)
+ cfg.setBackups(TOP_CHANGE_THREAD_CNT);
+
return cfg;
}