You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/09/15 10:50:19 UTC
[1/2] ignite git commit: ignite-6137: CAS logic fix in async commit
This closes #2496.
Repository: ignite
Updated Branches:
refs/heads/master 319aa8402 -> 1fcc96d62
ignite-6137: CAS logic fix in async commit
This closes #2496.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8610471e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8610471e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8610471e
Branch: refs/heads/master
Commit: 8610471ed8d28c600268407be1a2d6ddfbf45f6c
Parents: 91cf66e
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 15 13:49:56 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 15 13:49:56 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8610471e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index c55276c..058a3ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -3218,7 +3218,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
GridNearTxFinishFuture fut = commitFut;
- if (fut == null &&
+ if (fut != null ||
!COMMIT_FUT_UPD.compareAndSet(this, null, fut = new GridNearTxFinishFuture<>(cctx, this, true)))
return commitFut;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8610471e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index e667c49..eb19873 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -33,8 +33,10 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.transactions.Transaction;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
* Tests that system transactions do not interact with user transactions.
@@ -105,6 +107,22 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCacheAbstractSelf
/**
* @throws Exception If failed.
*/
+ public void testGridNearTxLocalDuplicateAsyncCommit() throws Exception {
+ IgniteKernal ignite = (IgniteKernal)grid(0);
+
+ IgniteInternalCache<Object, Object> utilityCache = ignite.context().cache().utilityCache();
+
+ try (GridNearTxLocal itx = utilityCache.txStartEx(OPTIMISTIC, SERIALIZABLE)) {
+ utilityCache.put("1", "1");
+
+ itx.commitNearTxLocalAsync();
+ itx.commitNearTxLocalAsync().get();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
private void checkTransactionsCommitted() throws Exception {
for (int i = 0; i < gridCount(); i++) {
IgniteKernal kernal = (IgniteKernal)grid(i);
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1fcc96d6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1fcc96d6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1fcc96d6
Branch: refs/heads/master
Commit: 1fcc96d624356b04de78f79b831d9e0049b8928b
Parents: 8610471 319aa84
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 15 13:50:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 15 13:50:14 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/pagemem/PageIdUtils.java | 13 +++
.../pagemem/wal/record/CheckpointRecord.java | 6 ++
.../internal/pagemem/wal/record/DataEntry.java | 1 +
.../internal/pagemem/wal/record/DataRecord.java | 2 +-
.../wal/record/MemoryRecoveryRecord.java | 7 ++
.../pagemem/wal/record/PageSnapshot.java | 23 +++++-
.../internal/pagemem/wal/record/TxRecord.java | 6 ++
.../delta/DataPageInsertFragmentRecord.java | 13 ++-
.../wal/record/delta/DataPageInsertRecord.java | 6 ++
.../wal/record/delta/DataPageRemoveRecord.java | 2 +-
.../delta/DataPageSetFreeListPageRecord.java | 6 ++
.../wal/record/delta/DataPageUpdateRecord.java | 6 ++
.../wal/record/delta/FixCountRecord.java | 9 +++
.../record/delta/FixLeftmostChildRecord.java | 9 +++
.../pagemem/wal/record/delta/FixRemoveId.java | 6 ++
.../wal/record/delta/InitNewPageRecord.java | 2 -
.../wal/record/delta/InnerReplaceRecord.java | 6 ++
.../pagemem/wal/record/delta/InsertRecord.java | 2 +-
.../pagemem/wal/record/delta/MergeRecord.java | 2 +-
.../wal/record/delta/MetaPageAddRootRecord.java | 9 +++
.../wal/record/delta/MetaPageCutRootRecord.java | 6 ++
.../wal/record/delta/MetaPageInitRecord.java | 6 ++
.../delta/MetaPageInitRootInlineRecord.java | 7 +-
.../record/delta/MetaPageInitRootRecord.java | 6 ++
.../delta/MetaPageUpdateLastAllocatedIndex.java | 6 ++
...aPageUpdateLastSuccessfulFullSnapshotId.java | 6 ++
.../MetaPageUpdateLastSuccessfulSnapshotId.java | 6 ++
.../delta/MetaPageUpdateNextSnapshotId.java | 6 ++
.../MetaPageUpdatePartitionDataRecord.java | 2 +-
.../wal/record/delta/NewRootInitRecord.java | 6 ++
.../delta/PageListMetaResetCountRecord.java | 6 ++
.../delta/PagesListInitNewPageRecord.java | 4 +-
.../record/delta/PagesListRemovePageRecord.java | 3 +-
.../record/delta/PagesListSetNextRecord.java | 6 ++
.../delta/PagesListSetPreviousRecord.java | 6 ++
.../record/delta/PartitionDestroyRecord.java | 6 ++
.../record/delta/PartitionMetaStateRecord.java | 6 ++
.../pagemem/wal/record/delta/RecycleRecord.java | 15 ++++
.../pagemem/wal/record/delta/RemoveRecord.java | 2 +-
.../pagemem/wal/record/delta/ReplaceRecord.java | 6 ++
.../record/delta/SplitExistingPageRecord.java | 2 +-
.../record/delta/SplitForwardPageRecord.java | 24 ++++++
.../record/delta/TrackingPageDeltaRecord.java | 14 +++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 3 +-
.../cache/persistence/file/FileIODecorator.java | 1 -
.../freelist/io/PagesListMetaIO.java | 21 +++++
.../freelist/io/PagesListNodeIO.java | 16 ++++
.../cache/persistence/tree/io/BPlusIO.java | 12 +++
.../cache/persistence/tree/io/BPlusMetaIO.java | 12 +++
.../cache/persistence/tree/io/DataPageIO.java | 25 +++++-
.../cache/persistence/tree/io/PageIO.java | 27 +++++++
.../cache/persistence/tree/io/PageMetaIO.java | 14 ++++
.../tree/io/PagePartitionCountersIO.java | 27 +++++++
.../tree/io/PagePartitionMetaIO.java | 19 +++++
.../persistence/tree/io/TrackingPageIO.java | 31 ++++++++
.../wal/FileWriteAheadLogManager.java | 6 ++
.../reader/StandaloneWalRecordsIterator.java | 2 +-
.../persistence/wal/record/HeaderRecord.java | 6 ++
.../wal/serializer/RecordV1Serializer.java | 21 ++++-
.../database/IgniteDbAbstractTest.java | 6 --
modules/dev-utils/pom.xml | 50 ++++++++++++
.../development/utils/IgniteWalConverter.java | 83 ++++++++++++++++++++
pom.xml | 1 +
63 files changed, 643 insertions(+), 33 deletions(-)
----------------------------------------------------------------------