Delete CLOCK, and remove check FULL_SYNC.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcc4d856 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcc4d856 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcc4d856 Branch: refs/heads/ignite-4587 Commit: fcc4d8567b9ec39bb9632cf64da5f4b4390a5928 Parents: 25d4ea5 Author: Max Kozlov <[email protected]> Authored: Mon Feb 13 16:14:25 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Mon Feb 13 16:14:25 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 6 ------ .../GridCacheRebalancingPartitionDistributionTest.java | 2 +- .../testframework/junits/common/GridCommonAbstractTest.java | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 0be2072..baef2e8 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -284,12 +284,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cfg.getAtomicityMode() == ATOMIC) { if (cfg.getAtomicWriteOrderMode() == null) { - cfg.setAtomicWriteOrderMode(cfg.getWriteSynchronizationMode() == FULL_SYNC ? - CacheAtomicWriteOrderMode.CLOCK : - CacheAtomicWriteOrderMode.PRIMARY); - } - else if (cfg.getWriteSynchronizationMode() != FULL_SYNC && - cfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK) { cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY); U.warn(log, "Automatically set write order mode to PRIMARY for better performance " + http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java index 61ee9ea..68f5119 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionDistributionTest.java @@ -53,7 +53,7 @@ public class GridCacheRebalancingPartitionDistributionTest extends GridRollingRe .setCacheMode(CacheMode.PARTITIONED) .setBackups(1) .setAffinity(new RendezvousAffinityFunction(true /* machine-safe */, 271)) - .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.CLOCK) + .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY) .setRebalanceMode(CacheRebalanceMode.SYNC) .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); } http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc4d856/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 549c486..7ab76f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -1120,11 +1120,6 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { */ protected void atomicClockModeDelay(IgniteCache cache) throws Exception { CacheConfiguration ccfg = (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class); - - if (ccfg.getCacheMode() != LOCAL && - ccfg.getAtomicityMode() == CacheAtomicityMode.ATOMIC && - ccfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK) - U.sleep(50); } /**
