This is an automated email from the ASF dual-hosted git repository.
vldpyatkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 28d7909c097 IGNITE-28612 Stale near-cache value may be returned after
rollback to savepoint (#13515)
28d7909c097 is described below
commit 28d7909c0975617a860371c99a557dae3d8361a6
Author: Vladislav Pyatkov <[email protected]>
AuthorDate: Tue Aug 25 20:52:30 2026 +0300
IGNITE-28612 Stale near-cache value may be returned after rollback to
savepoint (#13515)
---
.../near/GridNearTransactionalCache.java | 5 +
.../TxSavepointNearCacheVisibilityTest.java | 130 +++++++++++++++++++++
.../transactions/TxSavepointParameterizedTest.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite12.java | 2 +
4 files changed, 139 insertions(+), 6 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 7074bda1b12..8c06cd6fc0f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -509,6 +509,8 @@ public class GridNearTransactionalCache<K, V> extends
GridNearCacheAdapter<K, V>
return;
try {
+ GridCacheVersion obsoleteVer = forSavepoint ? nextVersion() : null;
+
int keyCnt = -1;
Map<ClusterNode, GridNearUnlockRequest> map = null;
@@ -558,6 +560,9 @@ public class GridNearTransactionalCache<K, V> extends
GridNearCacheAdapter<K, V>
// Remove candidate from local node first.
if (entry.removeLock(cand.version())) {
+ if (forSavepoint)
+ evictNearEntry(entry, obsoleteVer,
cand.topologyVersion());
+
if (primary.isLocal()) {
dht.removeLocks(
primary.id(),
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointNearCacheVisibilityTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointNearCacheVisibilityTest.java
new file mode 100644
index 00000000000..4a7c243d19d
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointNearCacheVisibilityTest.java
@@ -0,0 +1,130 @@
+/*
+ * 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.transactions;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+
+import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
+import static
org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
+
+/**
+ * Test checks near cache entry visibility after a transaction rollback to
savepoint.
+ */
+public class TxSavepointNearCacheVisibilityTest extends GridCommonAbstractTest
{
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName)
+ .setCacheConfiguration(new CacheConfiguration<Integer,
Integer>(DEFAULT_CACHE_NAME)
+
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
+ .setNearConfiguration(new NearCacheConfiguration<>())
+ .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
+ .setCacheMode(CacheMode.PARTITIONED)
+ .setBackups(1))
+ .setCommunicationSpi(new TestRecordingCommunicationSpi());
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ super.afterTest();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testRolledBackEntryVisibleWithoutRemoteUnlock() throws
Exception {
+ Ignite ignite0 = startGridsMultiThreaded(2);
+ Ignite ignite1 = grid(1);
+
+ awaitPartitionMapExchange();
+
+ IgniteCache<Integer, Integer> cache0 =
ignite0.cache(DEFAULT_CACHE_NAME);
+ IgniteCache<Integer, Integer> cache1 =
ignite1.cache(DEFAULT_CACHE_NAME);
+
+ int node0Key = primaryKey(cache0);
+ int node1Key = primaryKey(cache1);
+
+ cache0.put(node0Key, -1);
+ cache0.put(node1Key, -1);
+
+ TestRecordingCommunicationSpi commSpi =
TestRecordingCommunicationSpi.spi(ignite1);
+
+ commSpi.blockMessages((node, msg) ->
+ msg instanceof GridDhtUnlockRequest &&
node.id().equals(ignite0.cluster().localNode().id()));
+
+ CountDownLatch savepointRolledBackLatch = new CountDownLatch(1);
+ CountDownLatch finishFirstTxLatch = new CountDownLatch(1);
+
+ IgniteInternalFuture<?> fut = GridTestUtils.runAsync(() -> {
+ try (Transaction tx = ignite0.transactions().txStart(PESSIMISTIC,
READ_COMMITTED, 30_000, 2)) {
+ cache0.put(node0Key, 1);
+
+ tx.savepoint("sp");
+
+ cache0.put(node1Key, 1);
+
+ tx.rollbackToSavepoint("sp");
+
+ savepointRolledBackLatch.countDown();
+
+ assertTrue(finishFirstTxLatch.await(10, TimeUnit.SECONDS));
+
+ cache0.put(node1Key, 2);
+
+ tx.commit();
+ }
+ });
+
+ try {
+ assertTrue(savepointRolledBackLatch.await(10, TimeUnit.SECONDS));
+ assertTrue(commSpi.waitForBlocked(1, 10_000));
+
+ cache1.put(node1Key, 42);
+
+ assertFalse(fut.isDone());
+ assertEquals(Integer.valueOf(42), cache0.get(node1Key));
+ }
+ finally {
+ commSpi.stopBlock();
+
+ finishFirstTxLatch.countDown();
+ }
+
+ fut.get(10_000);
+
+ assertEquals(Integer.valueOf(2), cache0.get(node1Key));
+ }
+}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointParameterizedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointParameterizedTest.java
index ba92ac5aefc..07578960af7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointParameterizedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxSavepointParameterizedTest.java
@@ -280,16 +280,12 @@ public class TxSavepointParameterizedTest extends
GridCommonAbstractTest {
}
});
+ assertTrue(savepointRolledBackLatch.await(10, TimeUnit.SECONDS));
+
updateKeyFormPrimary(node1Key);
assertFalse(fut.isDone());
- // TODO: IGNITE-28612 Entry visibility violation in transactional
replication cache with one backup and near.
- if (initKeies && useNearCache && backups == 1 && spKeyOnTxInitiator &&
!replicated) {
- assertTrue(GridTestUtils.waitForCondition(() ->
- Integer.valueOf(42).equals(cache0.get(node1Key)), 10_000));
- }
-
assertEquals(Integer.valueOf(42), cache0.get(node1Key));
finishFirstTxLatch.countDown();
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite12.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite12.java
index bf76638d2e1..6a6e82dc200 100755
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite12.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite12.java
@@ -48,6 +48,7 @@ import
org.apache.ignite.internal.processors.cache.transactions.TxCrossCacheRemo
import
org.apache.ignite.internal.processors.cache.transactions.TxRecoveryConcurrentTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxRecoveryWithConcurrentRollbackTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxSavepointItTest;
+import
org.apache.ignite.internal.processors.cache.transactions.TxSavepointNearCacheVisibilityTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxSavepointParameterizedTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxWithKeyContentionSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
@@ -113,6 +114,7 @@ public class IgniteCacheTestSuite12 {
GridTestUtils.addTestIfNeeded(suite,
DelayedOwningDuringExchangeTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, TxSavepointItTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
TxSavepointNearCacheVisibilityTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
TxSavepointParameterizedTest.class, ignoredTests);
return suite;
