Fixed test. Signed-off-by: Andrey Gura <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f56406b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f56406b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f56406b Branch: refs/heads/master Commit: 2f56406b6ca3ab6a321b665a096e7437228c47e6 Parents: 86cfe11 Author: Dmitriy Govorukhin <[email protected]> Authored: Thu Aug 24 15:58:27 2017 +0300 Committer: Andrey Gura <[email protected]> Committed: Tue Aug 29 17:32:04 2017 +0300 ---------------------------------------------------------------------- .../cluster/GridClusterStateProcessor.java | 2 +- .../IgnitePdsCacheRebalancingAbstractTest.java | 3 +- .../wal/IgniteWalHistoryReservationsTest.java | 70 +++++++++++++++++--- 3 files changed, 62 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2f56406b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index cdfab21..64ee472 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -430,7 +430,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { GridChangeGlobalStateFuture fut = stateChangeFut.get(); - while (fut == null) { + while (fut == null || fut.isDone()) { fut = new GridChangeGlobalStateFuture(UUID.randomUUID(), activate, ctx); if (stateChangeFut.compareAndSet(null, fut)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/2f56406b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java index 9ceb87c..2f43951 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java @@ -558,9 +558,8 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb cntrs.put(part.id(), part.updateCounter()); } - for (int k0 = 0; k0 < k; k0++) { + for (int k0 = 0; k0 < k; k0++) assertEquals(String.valueOf(k0), k0, ig0.cache(cacheName).get(k0)); - } } assertEquals(ig.affinity(cacheName).partitions(), cntrs.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/2f56406b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java index 4bea63f..94045ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java @@ -22,6 +22,7 @@ import java.util.concurrent.locks.Lock; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; @@ -57,8 +58,14 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest { MemoryConfiguration memCfg = new MemoryConfiguration(); - memCfg.setMemoryPolicies(new MemoryPolicyConfiguration().setInitialSize(200 * 1024 * 1024) - .setMaxSize(200 * 1024 * 1024).setName("dfltMemPlc")); + long memSize = 200L * 1024L * 1024L; + + memCfg.setMemoryPolicies( + new MemoryPolicyConfiguration() + .setInitialSize(memSize) + .setMaxSize(memSize) + .setName("dfltMemPlc") + ); memCfg.setDefaultMemoryPolicyName("dfltMemPlc"); @@ -110,24 +117,59 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest { ig0.active(true); - IgniteCache<Object, Object> cache = ig0.cache("cache1"); + long start = U.currentTimeMillis(); - for (int k = 0; k < entryCnt; k++) - cache.put(k, k); + log.warning("Start loading"); + + try (IgniteDataStreamer<Object, Object> st = ig0.dataStreamer("cache1")){ + for (int k = 0; k < entryCnt; k++){ + st.addData(k, k); + + printProgress(k); + } + } + + log.warning("Finish loading time:" + (U.currentTimeMillis() - start)); forceCheckpoint(); - for (int k = 0; k < entryCnt; k++) - cache.put(k, k * 2); + start = U.currentTimeMillis(); + + log.warning("Start loading"); + + try (IgniteDataStreamer<Object, Object> st = ig0.dataStreamer("cache1")) { + st.allowOverwrite(true); + + for (int k = 0; k < entryCnt; k++) { + st.addData(k, k * 2); + + printProgress(k); + } + } + + log.warning("Finish loading time:" + (U.currentTimeMillis() - start)); forceCheckpoint(); - for (int k = 0; k < entryCnt; k++) - cache.put(k, k); + start = U.currentTimeMillis(); + + log.warning("Start loading"); + + try (IgniteDataStreamer<Object, Object> st = ig0.dataStreamer("cache1")){ + st.allowOverwrite(true); + + for (int k = 0; k < entryCnt; k++){ + st.addData(k, k); + + printProgress(k); + } + } + + log.warning("Finish loading time:" + (U.currentTimeMillis() - start)); forceCheckpoint(); - Lock lock = cache.lock(0); + Lock lock = ig0.cache("cache1").lock(0); lock.lock(); @@ -195,6 +237,14 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest { } /** + * + */ + private void printProgress(int k){ + if (k % 1000 == 0) + log.warning("Keys -> " + k); + } + + /** * @throws Exception If failed. */ public void testRemovesArePreloadedIfHistoryIsAvailable() throws Exception {
