Repository: ignite Updated Branches: refs/heads/ignite-4424 6bcd9c631 -> ff0cff503
ignite-4244 minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff0cff50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff0cff50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff0cff50 Branch: refs/heads/ignite-4424 Commit: ff0cff5037b6beb539a8faea5fbf21406711238a Parents: 6bcd9c6 Author: sboikov <[email protected]> Authored: Mon Dec 26 14:23:51 2016 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 26 14:23:51 2016 +0300 ---------------------------------------------------------------------- .../GridNearAtomicAbstractUpdateFuture.java | 7 ++- .../GridNearAtomicSingleUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 +- .../AtomicPutAllChangingTopologyTest.java | 59 +++++++++++++------- 4 files changed, 45 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0cff50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java index 19b386b..8a1b678 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java @@ -306,7 +306,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt * @param req Request. * @param e Error. */ - protected void onSendError(GridNearAtomicAbstractUpdateRequest req, IgniteCheckedException e) { + protected final void onSendError(GridNearAtomicAbstractUpdateRequest req, IgniteCheckedException e) { synchronized (mux) { GridNearAtomicUpdateResponse res = new GridNearAtomicUpdateResponse(cctx.cacheId(), req.nodeId(), @@ -322,10 +322,11 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt /** * Adds future prevents topology change before operation complete. * Should be invoked before topology lock released. + * * @param topVer Topology version. - * @return Future version in case Future added. + * @return Future version in case future added. */ - protected GridCacheVersion addAtomicFuture(AffinityTopologyVersion topVer) { + protected final GridCacheVersion addAtomicFuture(AffinityTopologyVersion topVer) { GridCacheVersion futVer = cctx.versions().next(topVer); if (storeFuture()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0cff50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 1b32ec9..65aaff9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -499,7 +499,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda /** * @return Future version. */ - GridCacheVersion onFutureDone() { + private GridCacheVersion onFutureDone() { GridCacheVersion ver0; GridFutureAdapter<Void> fut0; http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0cff50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 10b0fbf..a23b5d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -606,6 +606,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu /** * @param topVer Topology version. + * @param futVer Future ID. * @param remapKeys Keys to remap. */ void map(AffinityTopologyVersion topVer, @@ -715,7 +716,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu /** * @return Future version. */ - GridCacheVersion onFutureDone() { + private GridCacheVersion onFutureDone() { GridCacheVersion ver0; GridFutureAdapter<Void> fut0; http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0cff50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicPutAllChangingTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicPutAllChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicPutAllChangingTopologyTest.java index 5920dea..878cb17 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicPutAllChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/AtomicPutAllChangingTopologyTest.java @@ -26,11 +26,6 @@ import java.util.concurrent.CountDownLatch; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.CachePeekMode; -import org.apache.ignite.cache.CacheRebalanceMode; -import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.affinity.fair.FairAffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -42,6 +37,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheMode.REPLICATED; +import static org.apache.ignite.cache.CachePeekMode.BACKUP; +import static org.apache.ignite.cache.CachePeekMode.PRIMARY; +import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + /** */ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { /** */ @@ -59,14 +61,16 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { /** */ private static volatile CountDownLatch FILLED_LATCH; - /** */ - private CacheConfiguration<Integer, Integer> cacheCfg() { + /** + * @return Cache configuration. + */ + private CacheConfiguration<Integer, Integer> cacheConfig() { return new CacheConfiguration<Integer, Integer>() - .setAtomicityMode(CacheAtomicityMode.ATOMIC) - .setCacheMode(CacheMode.REPLICATED) + .setAtomicityMode(ATOMIC) + .setCacheMode(REPLICATED) .setAffinity(new FairAffinityFunction(false, 1)) - .setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC) - .setRebalanceMode(CacheRebalanceMode.SYNC) + .setWriteSynchronizationMode(FULL_SYNC) + .setRebalanceMode(SYNC) .setName(CACHE_NAME); } @@ -80,7 +84,7 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { } /** - * + * @throws Exception If failed. */ public void testPutAllOnChangingTopology() throws Exception { List<IgniteInternalFuture> futs = new LinkedList<>(); @@ -119,7 +123,10 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { stopAllGrids(); } - /** */ + /** + * @return Future. + * @throws IgniteCheckedException If failed. + */ private IgniteInternalFuture startSeedNodeAsync() throws IgniteCheckedException { return GridTestUtils.runAsync(new Callable<Object>() { @Override public Boolean call() throws Exception { @@ -127,7 +134,7 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { log.info("Creating cache."); - IgniteCache<Integer, Integer> cache = node.getOrCreateCache(cacheCfg()); + IgniteCache<Integer, Integer> cache = node.getOrCreateCache(cacheConfig()); log.info("Created cache."); @@ -151,7 +158,11 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { }); } - /** */ + /** + * @param nodeId Node index. + * @return Future. + * @throws IgniteCheckedException If failed. + */ private IgniteInternalFuture startNodeAsync(final int nodeId) throws IgniteCheckedException { return GridTestUtils.runAsync(new Callable<Object>() { @Override public Boolean call() throws Exception { @@ -159,7 +170,7 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { log.info("Getting cache."); - IgniteCache<Integer, Integer> cache = node.getOrCreateCache(cacheCfg()); + IgniteCache<Integer, Integer> cache = node.getOrCreateCache(cacheConfig()); log.info("Got cache."); @@ -176,20 +187,26 @@ public class AtomicPutAllChangingTopologyTest extends GridCommonAbstractTest { }); } - /** */ + /** + * @param node Node. + * @param cache Cache. + * @throws Exception If failed. + */ private void checkCacheState(Ignite node, IgniteCache<Integer, Integer> cache) throws Exception { - int locSize = cache.localSize(CachePeekMode.PRIMARY, CachePeekMode.BACKUP); + int locSize = cache.localSize(PRIMARY, BACKUP); int locSize2 = -1; if (locSize != CACHE_SIZE) { U.sleep(5000); // Rechecking. - locSize2 = cache.localSize(CachePeekMode.PRIMARY, CachePeekMode.BACKUP); + locSize2 = cache.localSize(PRIMARY, BACKUP); } - assertEquals("Wrong cache size on node " + "[node=" + node.configuration().getGridName() + - ", expected= " + CACHE_SIZE + ", actual=" + locSize + ", actual2=" + locSize2 + "]", + assertEquals("Wrong cache size on node [node=" + node.configuration().getGridName() + + ", expected= " + CACHE_SIZE + + ", actual=" + locSize + + ", actual2=" + locSize2 + "]", locSize, CACHE_SIZE); } } \ No newline at end of file
