ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [1/6] ignite git commit: ignite-3477-master fix failover test (lost partition), and skip exception on node stopping
Date Wed, 29 Mar 2017 12:37:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3477-master 22fc1d7eb -> 4e42bb8a1


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/7265c13f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7265c13f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7265c13f

Branch: refs/heads/ignite-3477-master
Commit: 7265c13f6f9eff24e504c180bc8eb91a7b28eea7
Parents: d3e2afd
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Wed Mar 29 15:27:35 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Mar 29 15:35:27 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/7265c13f/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/7265c13f/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;
     }
 


Mime
View raw message