[03/45] ignite git commit: IGNITE-9429 Fixed flaky GridCacheReplicatedDataStructuresFailoverSelfTest

2018-08-30 Thread agoncharuk 
IGNITE-9429 Fixed flaky GridCacheReplicatedDataStructuresFailoverSelfTest


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

Branch: refs/heads/ignite-9273
Commit: 2b9fc2ebc8b163773ce032b8eca1de17c691ddcc
Parents: 184d6a5
Author: Alexey Goncharuk 
Authored: Thu Aug 30 12:39:22 2018 +0300
Committer: Alexey Goncharuk 
Committed: Thu Aug 30 12:40:16 2018 +0300

--
 ...CacheAbstractDataStructuresFailoverSelfTest.java | 16 +---
 ...cheReplicatedDataStructuresFailoverSelfTest.java |  8 
 2 files changed, 13 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2b9fc2eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index 9da1161..797e90f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -119,11 +119,6 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 }
 
 /** {@inheritDoc} */
-@Override protected void afterTestsStopped() throws Exception {
-// No-op
-}
-
-/** {@inheritDoc} */
 @Override protected void beforeTest() throws Exception {
 startGridsMultiThreaded(gridCount());
 
@@ -1362,7 +1357,7 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 if (failed.get())
 return;
 
-int idx = nodeIdx.getAndIncrement();
+int idx = nodeIdx.incrementAndGet();
 
 Thread.currentThread().setName("thread-" + 
getTestIgniteInstanceName(idx));
 
@@ -1373,8 +1368,15 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 
 cb.apply(g);
 }
+catch (IgniteException e) {
+if (!X.hasCause(e, 
NodeStoppingException.class) &&
+!X.hasCause(e, 
IllegalStateException.class))
+throw e;
+
+// OK for this test.
+}
 finally {
-if(circular)
+if (circular)
 
stopGrid(G.allGrids().get(0).configuration().getIgniteInstanceName());
 else
 stopGrid(idx);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b9fc2eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index a228718..cb6e77e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -40,16 +40,16 @@ public class 
GridCacheReplicatedDataStructuresFailoverSelfTest
 }
 
 /**
- * @throws Exception If failed.
+ *
  */
-public void 
testFairReentrantLockConstantMultipleTopologyChangeNonFailoverSafe() throws 
Exception {
+@Override public void 
testFairReentrantLockConstantMultipleTopologyChangeNonFailoverSafe() {
 fail("https://issues.apache.org/jira/browse/IGNITE-6454;);
 }
 
 /**
- * @throws Exception If failed.
+ *
  */
-public void

ignite git commit: IGNITE-9429 Fixed flaky GridCacheReplicatedDataStructuresFailoverSelfTest

2018-08-30 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/master 184d6a563 -> 2b9fc2ebc


IGNITE-9429 Fixed flaky GridCacheReplicatedDataStructuresFailoverSelfTest


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

Branch: refs/heads/master
Commit: 2b9fc2ebc8b163773ce032b8eca1de17c691ddcc
Parents: 184d6a5
Author: Alexey Goncharuk 
Authored: Thu Aug 30 12:39:22 2018 +0300
Committer: Alexey Goncharuk 
Committed: Thu Aug 30 12:40:16 2018 +0300

--
 ...CacheAbstractDataStructuresFailoverSelfTest.java | 16 +---
 ...cheReplicatedDataStructuresFailoverSelfTest.java |  8 
 2 files changed, 13 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2b9fc2eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index 9da1161..797e90f 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -119,11 +119,6 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 }
 
 /** {@inheritDoc} */
-@Override protected void afterTestsStopped() throws Exception {
-// No-op
-}
-
-/** {@inheritDoc} */
 @Override protected void beforeTest() throws Exception {
 startGridsMultiThreaded(gridCount());
 
@@ -1362,7 +1357,7 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 if (failed.get())
 return;
 
-int idx = nodeIdx.getAndIncrement();
+int idx = nodeIdx.incrementAndGet();
 
 Thread.currentThread().setName("thread-" + 
getTestIgniteInstanceName(idx));
 
@@ -1373,8 +1368,15 @@ public abstract class 
GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
 
 cb.apply(g);
 }
+catch (IgniteException e) {
+if (!X.hasCause(e, 
NodeStoppingException.class) &&
+!X.hasCause(e, 
IllegalStateException.class))
+throw e;
+
+// OK for this test.
+}
 finally {
-if(circular)
+if (circular)
 
stopGrid(G.allGrids().get(0).configuration().getIgniteInstanceName());
 else
 stopGrid(idx);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b9fc2eb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
index a228718..cb6e77e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/replicated/GridCacheReplicatedDataStructuresFailoverSelfTest.java
@@ -40,16 +40,16 @@ public class 
GridCacheReplicatedDataStructuresFailoverSelfTest
 }
 
 /**
- * @throws Exception If failed.
+ *
  */
-public void 
testFairReentrantLockConstantMultipleTopologyChangeNonFailoverSafe() throws 
Exception {
+@Override public void 
testFairReentrantLockConstantMultipleTopologyChangeNonFailoverSafe() {
 fail("https://issues.apache.org/jira/browse/IGNITE-6454;);
 }
 
 /**
- * @throws Exception If failed.
+