fix

Author: zstan

modules/control-utility/src/test/java/org/apache/ignite/util/IdleVerifyCheckWithWriteThroughTest.java

@@ -239,12 +239,6 @@ public void testTxCoordinatorLeftClusterWithEnabledReadWriteThrough() throws Exc
 
         awaitPartitionMapExchange();
 
-        for (int nodeIdx : List.of(0, 2)) {
-            IgniteEx g = grid(nodeIdx);
-            IgniteCache<Object, Object> cacheInner = g.cache(DEFAULT_CACHE_NAME);
-            waitForCondition(() -> secondVal == (int)cacheInner.get(primaryKey), 1_000);
-        }
-
         assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(2)), "--cache", "idle_verify"));
 
         String out = testOut.toString();
@@ -264,6 +258,12 @@ public void testTxCoordinatorLeftClusterWithEnabledReadWriteThrough() throws Exc
         }
         testOut.reset();
 
+        for (int nodeIdx : List.of(0, 2)) {
+            IgniteEx g = grid(nodeIdx);
+            IgniteCache<Object, Object> cacheInner = g.cache(DEFAULT_CACHE_NAME);
+            waitForCondition(() -> secondVal == (int)cacheInner.get(primaryKey), 1_000);
+        }
+
         if (withPersistence) {
             stopAllGrids();
             startGridsMultiThreaded(3);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java

@@ -3219,15 +3219,19 @@ private void sendTxSalvage(IgniteInternalTx tx, UUID evtNodeId) {
                     if (tx.masterNodeIds().contains(nodeId))
                         continue;
 
-                    if (salvageReq == null)
-                        salvageReq = new GridDhtTxSalvageMessage(tx.nearXidVersion());
+                    ClusterNode involvedNode = cctx.discovery().node(nodeId);
 
-                    try {
-                        cctx.io().send(nodeId, salvageReq, tx.ioPolicy());
-                    }
-                    catch (IgniteCheckedException e) {
-                        log.warning("Failed to send salvage message [failedNodeId=" + evtNodeId +
-                            ", nodeId=" + nodeId + ']', e);
+                    if (involvedNode != null && !involvedNode.isLocal()) {
+                        if (salvageReq == null)
+                            salvageReq = new GridDhtTxSalvageMessage(tx.nearXidVersion());
+
+                        try {
+                            cctx.io().send(nodeId, salvageReq, tx.ioPolicy());
+                        }
+                        catch (IgniteCheckedException e) {
+                            log.warning("Failed to send salvage message [failedNodeId=" + evtNodeId +
+                                ", nodeId=" + nodeId + ']', e);
+                        }
                     }
                 }
             }