1093 To be rollbacked (datastructures)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75931082 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75931082 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75931082 Branch: refs/heads/ignite-1093-2 Commit: 75931082aae35537ae645dfbc76e105162ef8ecd Parents: 76665f5 Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 22 16:28:07 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 22 16:28:07 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheMvccCandidate.java | 2 + .../processors/cache/GridCacheMvccManager.java | 5 + .../IgniteCacheDataStructuresSelfTestSuite.java | 144 +++++++++---------- 3 files changed, 79 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75931082/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java index f19a054..3321323 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccCandidate.java @@ -528,6 +528,8 @@ public class GridCacheMvccCandidate implements Externalizable, return prev; } + public Exception added = new Exception(); + /** * @param prev Lock that comes before in the same thread. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/75931082/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 0960c9d..3e4fb0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -57,6 +57,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; @@ -767,6 +768,10 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { if (prev != null) { prev.next(cand); + if (cand.threadId() != prev.threadId()) { + U.error(log, "Linking invalid candidate [cur=" + cand + ", prev=" + prev + "]", prev.added); + } + cand.previous(prev); } http://git-wip-us.apache.org/repos/asf/ignite/blob/75931082/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index c44455f..93470ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -90,80 +90,80 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite { TestSuite suite = new TestSuite("Ignite Cache Data Structures Test Suite"); // Data structures. - suite.addTest(new TestSuite(GridCachePartitionedQueueFailoverDataConsistencySelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class)); - - suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalAtomicOffheapSetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class)); - suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class)); - - suite.addTest(new TestSuite(GridCacheReplicatedSequenceApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedSequenceMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedQueueMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedQueueRotativeMultiNodeTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedSetSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedDataStructuresFailoverSelfTest.class)); - suite.addTest(new TestSuite(IgniteReplicatedCountDownLatchSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class)); - suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedQueueFailoverDataConsistencySelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class)); +// +// suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalAtomicOffheapSetSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalOffheapQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheLocalAtomicQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(IgniteLocalCountDownLatchSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCacheReplicatedSequenceApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedSequenceMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedQueueMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedQueueRotativeMultiNodeTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedSetSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedDataStructuresFailoverSelfTest.class)); +// suite.addTest(new TestSuite(IgniteReplicatedCountDownLatchSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedSequenceApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedSequenceMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueMultiNodeSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicOffheapQueueCreateMultiNodeSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedOffHeapValuesSetSelfTest.class)); +// suite.addTest(new TestSuite(IgnitePartitionedSetNoBackupsSelfTest.class)); suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class)); suite.addTest(new TestSuite(IgnitePartitionedCountDownLatchSelfTest.class)); - suite.addTest(new TestSuite(IgniteDataStructureWithJobTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicSetFailoverSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedQueueRotativeMultiNodeTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class)); - suite.addTest(new TestSuite(GridCacheQueueCleanupSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedQueueEntryMoveSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedDataStructuresFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedOffheapDataStructuresFailoverSelfTest.class)); - suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class)); - - suite.addTest(new TestSuite(IgniteLocalAtomicLongApiSelfTest.class)); - suite.addTest(new TestSuite(IgnitePartitionedAtomicLongApiSelfTest.class)); - suite.addTest(new TestSuite(IgniteReplicatedAtomicLongApiSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedAtomicSequenceMultiThreadedTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedAtomicStampedApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedAtomicStampedApiSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedAtomicReferenceApiSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedAtomicReferenceApiSelfTest.class)); - - suite.addTest(new TestSuite(GridCachePartitionedNodeRestartTxSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedQueueJoinedNodeSelfTest.class)); - - suite.addTest(new TestSuite(IgniteDataStructureUniqueNameTest.class)); - - suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class)); - suite.addTest(new TestSuite(IgniteClientDiscoveryDataStructuresTest.class)); +// suite.addTest(new TestSuite(IgniteDataStructureWithJobTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedSetFailoverSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedOffheapSetFailoverSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicSetFailoverSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedQueueRotativeMultiNodeTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueRotativeMultiNodeTest.class)); +// suite.addTest(new TestSuite(GridCacheQueueCleanupSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedQueueEntryMoveSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedDataStructuresFailoverSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedOffheapDataStructuresFailoverSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class)); +// +// suite.addTest(new TestSuite(IgniteLocalAtomicLongApiSelfTest.class)); +// suite.addTest(new TestSuite(IgnitePartitionedAtomicLongApiSelfTest.class)); +// suite.addTest(new TestSuite(IgniteReplicatedAtomicLongApiSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedAtomicSequenceMultiThreadedTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedAtomicStampedApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedAtomicStampedApiSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedAtomicReferenceApiSelfTest.class)); +// suite.addTest(new TestSuite(GridCacheReplicatedAtomicReferenceApiSelfTest.class)); +// +// suite.addTest(new TestSuite(GridCachePartitionedNodeRestartTxSelfTest.class)); +// suite.addTest(new TestSuite(GridCachePartitionedQueueJoinedNodeSelfTest.class)); +// +// suite.addTest(new TestSuite(IgniteDataStructureUniqueNameTest.class)); +// +// suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class)); +// suite.addTest(new TestSuite(IgniteClientDiscoveryDataStructuresTest.class)); return suite; }
