ignite-3057 Fixed serializable tx, added sanity test.
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 470b1cc..7f3ecd0 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
@@ -825,7 +825,7 @@
if (log.isDebugEnabled())
log.debug("Committing near local tx: " + this);
- if (writeMap().isEmpty() && (optimistic() || readMap().isEmpty())) {
+ if (fastFinish()) {
state(PREPARING);
state(PREPARED);
state(COMMITTING);
@@ -882,7 +882,7 @@
if (log.isDebugEnabled())
log.debug("Rolling back near tx: " + this);
- if (writeMap().isEmpty() && (optimistic() || readMap().isEmpty())) {
+ if (fastFinish()) {
state(PREPARING);
state(PREPARED);
state(ROLLING_BACK);
@@ -942,6 +942,13 @@
}
/**
+ * @return {@code True} if 'fast finish' path can be used for transaction completion.
+ */
+ private boolean fastFinish() {
+ return writeMap().isEmpty() && ((optimistic() && !serializable()) || readMap().isEmpty());
+ }
+
+ /**
* Prepares next batch of entries in dht transaction.
*
* @param reads Read entries.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
new file mode 100644
index 0000000..61bfa89
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxFastFinishTest.java
@@ -0,0 +1,235 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+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 org.apache.ignite.transactions.Transaction;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheMode.PARTITIONED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
+import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
+
+/**
+ *
+ */
+public class CacheTxFastFinishTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private boolean client;
+
+ /** */
+ private boolean nearCache;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setCacheMode(PARTITIONED);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setBackups(1);
+ ccfg.setWriteSynchronizationMode(FULL_SYNC);
+
+ if (nearCache)
+ ccfg.setNearConfiguration(new NearCacheConfiguration());
+
+ cfg.setCacheConfiguration(ccfg);
+
+ cfg.setClientMode(client);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFastFinishTxNearCache() throws Exception {
+ nearCache = true;
+
+ fastFinishTx();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testFastFinishTx() throws Exception {
+ fastFinishTx();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ private void fastFinishTx() throws Exception {
+ startGrid(0);
+
+ fastFinishTx(ignite(0));
+
+ client = true;
+
+ startGrid(1);
+
+ for (int i = 0; i < 2; i++)
+ fastFinishTx(ignite(i));
+
+ client = false;
+
+ startGrid(2);
+
+ for (int i = 0; i < 3; i++)
+ fastFinishTx(ignite(i));
+
+ startGrid(3);
+
+ for (int i = 0; i < 4; i++)
+ fastFinishTx(ignite(i));
+
+ stopGrid(1);
+
+ for (int i = 0; i < 4; i++) {
+ if (i != 1)
+ fastFinishTx(ignite(i));
+ }
+ }
+
+ /**
+ * @param ignite Node.
+ */
+ private void fastFinishTx(Ignite ignite) {
+ IgniteTransactions txs = ignite.transactions();
+
+ IgniteCache cache = ignite.cache(null);
+
+ for (boolean commit : new boolean[]{true, false}) {
+ for (TransactionConcurrency c : TransactionConcurrency.values()) {
+ for (TransactionIsolation isolation : TransactionIsolation.values()) {
+ try (Transaction tx = txs.txStart(c, isolation)) {
+ checkFastTxFinish(tx, commit);
+ }
+ }
+ }
+
+ for (int i = 0; i < 100; i++) {
+ try (Transaction tx = txs.txStart(OPTIMISTIC, REPEATABLE_READ)) {
+ cache.get(i);
+
+ checkFastTxFinish(tx, commit);
+ }
+
+ try (Transaction tx = txs.txStart(OPTIMISTIC, READ_COMMITTED)) {
+ cache.get(i);
+
+ checkFastTxFinish(tx, commit);
+ }
+ }
+
+ for (int i = 0; i < 100; i++) {
+ try (Transaction tx = txs.txStart(OPTIMISTIC, SERIALIZABLE)) {
+ cache.get(i);
+
+ checkNormalTxFinish(tx, commit);
+ }
+
+ try (Transaction tx = txs.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ cache.get(i);
+
+ checkNormalTxFinish(tx, commit);
+ }
+ }
+
+ for (int i = 0; i < 100; i++) {
+ for (TransactionConcurrency c : TransactionConcurrency.values()) {
+ for (TransactionIsolation isolation : TransactionIsolation.values()) {
+ try (Transaction tx = txs.txStart(c, isolation)) {
+ cache.put(i, i);
+
+ checkNormalTxFinish(tx, commit);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * @param tx Transaction.
+ * @param commit Commit flag.
+ */
+ private void checkFastTxFinish(Transaction tx, boolean commit) {
+ if (commit)
+ tx.commit();
+ else
+ tx.rollback();
+
+ IgniteInternalTx tx0 = ((TransactionProxyImpl)tx).tx();
+
+ assertNull(GridTestUtils.getFieldValue(tx0, "prepFut"));
+ assertNull(GridTestUtils.getFieldValue(tx0, "commitFut"));
+ assertNull(GridTestUtils.getFieldValue(tx0, "rollbackFut"));
+ }
+
+ /**
+ * @param tx Transaction.
+ * @param commit Commit flag.
+ */
+ private void checkNormalTxFinish(Transaction tx, boolean commit) {
+ IgniteInternalTx tx0 = ((TransactionProxyImpl)tx).tx();
+
+ if (commit) {
+ tx.commit();
+
+ assertNotNull(GridTestUtils.getFieldValue(tx0, "prepFut"));
+ assertNotNull(GridTestUtils.getFieldValue(tx0, "commitFut"));
+ }
+ else {
+ tx.rollback();
+
+ assertNotNull(GridTestUtils.getFieldValue(tx0, "rollbackFut"));
+ }
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 7edd0a0..3238786 100755
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -44,6 +44,7 @@
import org.apache.ignite.internal.processors.cache.CacheNamesSelfTest;
import org.apache.ignite.internal.processors.cache.CacheNamesWithSpecialCharactersTest;
import org.apache.ignite.internal.processors.cache.CachePutEventListenerErrorSelfTest;
+import org.apache.ignite.internal.processors.cache.CacheTxFastFinishTest;
import org.apache.ignite.internal.processors.cache.GridCacheAffinityApiSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheAffinityMapperSelfTest;
import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest;
@@ -302,6 +303,8 @@
suite.addTestSuite(IgniteTxConfigCacheSelfTest.class);
+ suite.addTestSuite(CacheTxFastFinishTest.class);
+
return suite;
}
}
