This is an automated email from the ASF dual-hosted git repository.

NSAmelchev 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 ec446ff45af IGNITE-29273 Fix node failure on a backup commit that 
updates a near cache entry during rebalancing (#13813)
ec446ff45af is described below

commit ec446ff45af7b3e09e6d40a3e4397b82a6ce6d5d
Author: Nikita Amelchev <[email protected]>
AuthorDate: Thu Nov 12 12:33:50 2026 +0300

    IGNITE-29273 Fix node failure on a backup commit that updates a near cache 
entry during rebalancing (#13813)
---
 .../processors/cache/transactions/IgniteTxManager.java       |  4 ++--
 .../distributed/near/GridCacheNearTxMultiNodeSelfTest.java   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index d6dc0cd659a..b41fb51d068 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -966,9 +966,9 @@ public class IgniteTxManager extends 
GridCacheSharedManagerAdapter {
      * @return Local transaction.
      */
     @Nullable public IgniteTxLocalAdapter localTx() {
-        IgniteTxLocalAdapter tx = tx();
+        IgniteInternalTx tx = tx();
 
-        return tx != null && tx.local() ? tx : null;
+        return tx != null && tx.local() ? (IgniteTxLocalAdapter)tx : null;
     }
 
     /**
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index d371558225b..eb9315456b8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -28,6 +28,8 @@ import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.failure.FailureHandler;
+import org.apache.ignite.failure.TestFailureHandler;
 import org.apache.ignite.internal.IgniteKernal;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
 import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -57,6 +59,9 @@ public class GridCacheNearTxMultiNodeSelfTest extends 
GridCommonAbstractTest {
     /** Number of backups for partitioned tests. */
     protected int backups = 1;
 
+    /** */
+    private final TestFailureHandler failureHnd = new 
TestFailureHandler(false);
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String 
igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -76,6 +81,11 @@ public class GridCacheNearTxMultiNodeSelfTest extends 
GridCommonAbstractTest {
         return cfg;
     }
 
+    /** {@inheritDoc} */
+    @Override protected FailureHandler getFailureHandler(String 
igniteInstanceName) {
+        return failureHnd;
+    }
+
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         backups = 1;
@@ -152,6 +162,8 @@ public class GridCacheNearTxMultiNodeSelfTest extends 
GridCommonAbstractTest {
                 tx.close();
             }
 
+            assertNull(failureHnd.failureContext());
+
             stopGrid(priIgnite.name(), true);
             stopGrid(backupIgnite.name(), true);
 

Reply via email to