Merge branch 'ignite-3478' into ignite-3479 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1173da57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1173da57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1173da57 Branch: refs/heads/ignite-3479 Commit: 1173da57ce73e663248b09a41e26a735bad634e4 Parents: 2d2f2b4 Author: sboikov <[email protected]> Authored: Fri Sep 22 16:58:04 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 22 16:58:46 2017 +0300 ---------------------------------------------------------------------- .../mvcc/CacheCoordinatorsSharedManager.java | 8 ++--- .../cache/mvcc/CacheMvccTransactionsTest.java | 32 +++++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1173da57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java index 9d5a7fb..8a85be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsSharedManager.java @@ -521,7 +521,7 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager fut = waitTxFuts.remove(txCntr); - TestDebugLog.addMessage3("tx done", cntr, null, null); + TestDebugLog.addMessage3("tx done", txCntr, null, null); } if (fut != null) @@ -544,7 +544,7 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager * @param qryNodeId Node initiated query. * @return Counter for query. */ - private synchronized MvccCoordinatorVersionResponse assignQueryCounter(UUID qryNodeId, long futId) { + private MvccCoordinatorVersionResponse assignQueryCounter(UUID qryNodeId, long futId) { assert crdVer != 0; Long mvccCntr = committedCntr.get(); @@ -596,7 +596,7 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager /** * @param mvccCntr Query counter. */ - private synchronized void onQueryDone(long mvccCntr) { + private void onQueryDone(long mvccCntr) { TestDebugLog.addEntryMessage(mvccCntr, null, "qry done"); AtomicInteger cntr = activeQueries.get(mvccCntr); @@ -612,8 +612,6 @@ public class CacheCoordinatorsSharedManager<K, V> extends GridCacheSharedManager assert rmv; } - else - activeQueries.put(mvccCntr, left); } /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1173da57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java index 0db5b93..cc5e075 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java @@ -1189,11 +1189,11 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { ) throws Exception { - final int ACCOUNTS = 8; + final int ACCOUNTS = 20; final int ACCOUNT_START_VAL = 1000; - final int writers = 2; + final int writers = 4; final int readers = 4; @@ -1264,16 +1264,16 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { tx.commit(); } -// Map<Integer, MvccTestAccount> accounts = cache.getAll(keys); -// -// MvccTestAccount a1 = accounts.get(id1); -// MvccTestAccount a2 = accounts.get(id2); -// -// assertNotNull(a1); -// assertNotNull(a2); -// -// assertTrue(a1.updateCnt >= cntr1); -// assertTrue(a2.updateCnt >= cntr2); + Map<Integer, MvccTestAccount> accounts = cache.getAll(keys); + + MvccTestAccount a1 = accounts.get(id1); + MvccTestAccount a2 = accounts.get(id2); + + assertNotNull(a1); + assertNotNull(a2); + + assertTrue(a1.updateCnt >= cntr1); + assertTrue(a2.updateCnt >= cntr2); } info("Writer finished, updates: " + cnt); @@ -1312,9 +1312,11 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { if (ACCOUNTS != accounts.size()) { TestDebugLog.addMessage("wrong accounts number: " + accounts.keySet()); - List<Object> msgs = TestDebugLog.printMessages(true, null); + String t = Thread.currentThread().getName(); + + List<Object> msgs = TestDebugLog.printMessages(true, null, t); - TestDebugLog.printMessagesForThread(msgs, Thread.currentThread().getName(), "test_debug_thread.txt"); + TestDebugLog.printMessagesForThread(msgs, t, "test_debug_thread.txt"); System.exit(1); } @@ -1367,7 +1369,7 @@ public class CacheMvccTransactionsTest extends GridCommonAbstractTest { cacheParts, writers, readers, - 5000, + DFLT_TEST_TIME, init, writer, reader);
