You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/10/26 15:00:40 UTC
ignite git commit: Merge remote-tracking branch
'remotes/apache-main/master' into ignite-801
Repository: ignite
Updated Branches:
refs/heads/ignite-801 600b7a844 -> d8b277441
Merge remote-tracking branch 'remotes/apache-main/master' into ignite-801
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8b27744
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8b27744
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8b27744
Branch: refs/heads/ignite-801
Commit: d8b277441c00790bd153dd180cf936410c0398a2
Parents: 600b7a8
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Oct 26 17:00:29 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Oct 26 17:00:29 2015 +0300
----------------------------------------------------------------------
.../CacheDataStructuresManager.java | 2 +-
...eAbstractDataStructuresFailoverSelfTest.java | 21 ++++++--------------
2 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8b27744/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
index 1ff4575..930921b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java
@@ -770,4 +770,4 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter {
return "RemoveSetCallable [setId=" + setId + ']';
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d8b27744/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 eb07bbc..185460c 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
@@ -68,15 +68,6 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
/** */
private static final int TOP_CHANGE_THREAD_CNT = 3;
- /** */
- private static final int TOP_CHANGED_ERR_RETRY_CNT = 5;
-
- /** */
- private static final long TOP_CHANGED_ERR_RETRY_TIMEOUT = 3000;
-
- /** */
- private static final long READY_FUTURE_WAIT_TIMEOUT = 10_000;
-
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
return TEST_TIMEOUT;
@@ -490,6 +481,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
fut.get();
+ val = s.peek();
+
for (Ignite g : G.allGrids())
assertEquals(val, (int)g.<Integer>queue(STRUCTURE_NAME, 0, null).peek());
}
@@ -673,9 +666,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
}
}
catch (Exception e) {
- failed.set(true);
-
- throw F.wrap(e);
+ if (failed.compareAndSet(false, true))
+ throw F.wrap(e);
}
}
}, TOP_CHANGE_THREAD_CNT, "topology-change-thread");
@@ -727,9 +719,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Ig
}
}
catch (Exception e) {
- failed.set(true);
-
- throw F.wrap(e);
+ if (failed.compareAndSet(false, true))
+ throw F.wrap(e);
}
}
}, TOP_CHANGE_THREAD_CNT, "topology-change-thread");