IGNITE-27003 Log messages containing tx id, should also contain label

modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java

@@ -250,6 +250,7 @@
 import org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
 import org.apache.ignite.internal.tx.impl.TransactionInflights;
 import org.apache.ignite.internal.tx.impl.TxManagerImpl;
+import org.apache.ignite.internal.tx.impl.VolatileTxStateMetaStorage;
 import org.apache.ignite.internal.tx.message.TxMessageGroup;
 import org.apache.ignite.internal.tx.storage.state.rocksdb.TxStateRocksDbSharedStorage;
 import org.apache.ignite.internal.tx.test.TestLocalRwTxCounter;
@@ -1260,7 +1261,8 @@ private class Node {
                     clusterIdService
             );
 
-            lockManager = new HeapLockManager(systemConfiguration);
+            VolatileTxStateMetaStorage txStateVolatileStorage = new VolatileTxStateMetaStorage();
+            lockManager = new HeapLockManager(systemConfiguration, txStateVolatileStorage);
 
             MetricManager metricManager = new NoOpMetricManager();
 
@@ -1452,6 +1454,7 @@ private class Node {
                     clusterService,
                     replicaSvc,
                     lockManager,
+                    txStateVolatileStorage,
                     clockService,
                     new TransactionIdGenerator(addr.port()),
                     placementDriver,

modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java

@@ -186,6 +186,7 @@
 import org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
 import org.apache.ignite.internal.tx.impl.TransactionInflights;
 import org.apache.ignite.internal.tx.impl.TxManagerImpl;
+import org.apache.ignite.internal.tx.impl.VolatileTxStateMetaStorage;
 import org.apache.ignite.internal.tx.message.TxMessageGroup;
 import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage;
 import org.apache.ignite.internal.tx.storage.state.rocksdb.TxStateRocksDbSharedStorage;
@@ -616,6 +617,7 @@ public CompletableFuture<Boolean> invoke(Condition condition, Operation success,
                 clusterService,
                 replicaSvc,
                 lockManager,
+                new VolatileTxStateMetaStorage(),
                 clockService,
                 new TransactionIdGenerator(address.port()),
                 placementDriverManager.placementDriver(),

modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/ZonePartitionReplicaListener.java

@@ -182,7 +182,7 @@ public ZonePartitionReplicaListener(
                 txMessageSender
         );
 
-        txRecoveryMessageHandler = new TxRecoveryMessageHandler(txStatePartitionStorage, replicationGroupId, txRecoveryEngine);
+        txRecoveryMessageHandler = new TxRecoveryMessageHandler(txStatePartitionStorage, replicationGroupId, txRecoveryEngine, txManager);
 
         txCleanupRecoveryRequestHandler = new TxCleanupRecoveryRequestHandler(
                 txStatePartitionStorage,

modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/handlers/TxCleanupRecoveryRequestHandler.java

@@ -34,6 +34,7 @@
 import org.apache.ignite.internal.logger.IgniteLogger;
 import org.apache.ignite.internal.logger.Loggers;
 import org.apache.ignite.internal.replicator.ZonePartitionId;
+import org.apache.ignite.internal.tx.TransactionLogUtils;
 import org.apache.ignite.internal.tx.TxManager;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.tx.message.TxCleanupRecoveryRequest;
@@ -152,7 +153,7 @@ private CompletableFuture<?> callCleanup(TxMeta txMeta, UUID txId) {
                 txMeta.commitTimestamp(),
                 txId
         ).exceptionally(throwable -> {
-            LOG.warn("Failed to cleanup transaction [txId={}].", throwable, txId);
+            LOG.warn("Failed to cleanup transaction [{}].", throwable, TransactionLogUtils.formatTxInfo(txId, txManager));
 
             return null;
         });

modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/handlers/TxFinishReplicaRequestHandler.java

@@ -57,6 +57,7 @@
 import org.apache.ignite.internal.tx.IncompatibleSchemaAbortException;
 import org.apache.ignite.internal.tx.MismatchingTransactionOutcomeInternalException;
 import org.apache.ignite.internal.tx.PartitionEnlistment;
+import org.apache.ignite.internal.tx.TransactionLogUtils;
 import org.apache.ignite.internal.tx.TransactionResult;
 import org.apache.ignite.internal.tx.TxManager;
 import org.apache.ignite.internal.tx.TxMeta;
@@ -203,14 +204,16 @@ private CompletableFuture<TransactionResult> finishAndCleanup(
 
             // Let the client know a transaction has finished with a different outcome.
             if (commit != (txMeta.txState() == COMMITTED)) {
-                LOG.error("Failed to finish a transaction that is already finished [txId={}, expectedState={}, actualState={}].",
-                        txId,
+                LOG.error("Failed to finish a transaction that is already finished [{}, expectedState={}, actualState={}].",
+                        TransactionLogUtils.formatTxInfo(txId, txManager),
                         commit ? COMMITTED : ABORTED,
                         txMeta.txState()
                 );
 
                 throw new MismatchingTransactionOutcomeInternalException(
-                        "Failed to change the outcome of a finished transaction [txId=" + txId + ", txState=" + txMeta.txState() + "].",
+                        format("Failed to change the outcome of a finished transaction [{}, txState={}].",
+                                TransactionLogUtils.formatTxInfo(txId, txManager),
+                                txMeta.txState()),
                         new TransactionResult(txMeta.txState(), txMeta.commitTimestamp())
                 );
             }

modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/handlers/TxRecoveryMessageHandler.java

@@ -25,6 +25,8 @@
 import org.apache.ignite.internal.logger.Loggers;
 import org.apache.ignite.internal.partition.replicator.TxRecoveryEngine;
 import org.apache.ignite.internal.replicator.ZonePartitionId;
+import org.apache.ignite.internal.tx.TransactionLogUtils;
+import org.apache.ignite.internal.tx.TxManager;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.tx.message.TxRecoveryMessage;
 import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage;
@@ -38,16 +40,19 @@ public class TxRecoveryMessageHandler {
     private final TxStatePartitionStorage txStatePartitionStorage;
     private final ZonePartitionId replicationGroupId;
     private final TxRecoveryEngine txRecoveryEngine;
+    private final TxManager txManager;
 
     /** Constructor. */
     public TxRecoveryMessageHandler(
             TxStatePartitionStorage txStatePartitionStorage,
             ZonePartitionId replicationGroupId,
-            TxRecoveryEngine txRecoveryEngine
+            TxRecoveryEngine txRecoveryEngine,
+            TxManager txManager
     ) {
         this.txStatePartitionStorage = txStatePartitionStorage;
         this.replicationGroupId = replicationGroupId;
         this.txRecoveryEngine = txRecoveryEngine;
+        this.txManager = txManager;
     }
 
     /**
@@ -67,7 +72,7 @@ public CompletableFuture<Void> handle(TxRecoveryMessage request, UUID senderId)
             return txRecoveryEngine.runCleanupOnNode(replicationGroupId, txId, senderId);
         }
 
-        LOG.info("Orphan transaction has to be aborted [tx={}, meta={}].", txId, txMeta);
+        LOG.info("Orphan transaction has to be aborted [{}, meta={}].", TransactionLogUtils.formatTxInfo(txId, txManager), txMeta);
 
         return txRecoveryEngine.triggerTxRecovery(txId, senderId);
     }

modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/handlers/WriteIntentSwitchRequestHandler.java

@@ -52,6 +52,7 @@
 import org.apache.ignite.internal.replicator.ZonePartitionId;
 import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
 import org.apache.ignite.internal.schema.SchemaSyncService;
+import org.apache.ignite.internal.tx.TransactionLogUtils;
 import org.apache.ignite.internal.tx.TxManager;
 import org.apache.ignite.internal.tx.TxState;
 import org.apache.ignite.internal.tx.message.TableWriteIntentSwitchReplicaRequest;
@@ -84,6 +85,7 @@ public class WriteIntentSwitchRequestHandler {
     private final ReliableCatalogVersions reliableCatalogVersions;
     private final ReplicaTxFinishMarker txFinishMarker;
     private final ReplicationRaftCommandApplicator raftCommandApplicator;
+    private final TxManager txManager;
 
     /** Constructor. */
     public WriteIntentSwitchRequestHandler(
@@ -100,6 +102,7 @@ public WriteIntentSwitchRequestHandler(
         this.clockService = clockService;
         this.replicationGroupId = replicationGroupId;
         this.tableAwareReplicaRequestPreProcessor = tableAwareReplicaRequestPreProcessor;
+        this.txManager = txManager;
 
         reliableCatalogVersions = new ReliableCatalogVersions(schemaSyncService, catalogService);
         txFinishMarker = new ReplicaTxFinishMarker(txManager);
@@ -202,7 +205,8 @@ private CompletableFuture<Object> applyCommandToGroup(WriteIntentSwitchReplicaRe
                 .applyCommandWithExceptionHandling(wiSwitchCmd)
                 .whenComplete((res, ex) -> {
                     if (ex != null && !ReplicatorRecoverableExceptions.isRecoverable(ex)) {
-                        LOG.warn("Failed to complete transaction cleanup command [txId=" + request.txId() + ']', ex);
+                        LOG.warn("Failed to complete transaction cleanup command [{}]", ex,
+                                TransactionLogUtils.formatTxInfo(request.txId(), txManager));
                     }
                 });
     }

modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/LockManagerBenchmark.java

@@ -31,6 +31,7 @@
 import org.apache.ignite.internal.tx.LockMode;
 import org.apache.ignite.internal.tx.impl.HeapLockManager;
 import org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
+import org.apache.ignite.internal.tx.impl.VolatileTxStateMetaStorage;
 import org.apache.ignite.internal.tx.impl.WaitDieDeadlockPreventionPolicy;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Measurement;
@@ -62,7 +63,7 @@ public class LockManagerBenchmark {
      */
     @Setup
     public void setUp() {
-        lockManager = new HeapLockManager(DEFAULT_SLOTS);
+        lockManager = new HeapLockManager(DEFAULT_SLOTS, new VolatileTxStateMetaStorage());
         lockManager.start(new WaitDieDeadlockPreventionPolicy());
         generator = new TransactionIdGenerator(0);
         clock = new TestHybridClock(() -> 0L);

modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java

@@ -225,6 +225,7 @@
 import org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
 import org.apache.ignite.internal.tx.impl.TransactionInflights;
 import org.apache.ignite.internal.tx.impl.TxManagerImpl;
+import org.apache.ignite.internal.tx.impl.VolatileTxStateMetaStorage;
 import org.apache.ignite.internal.tx.message.TxMessageGroup;
 import org.apache.ignite.internal.tx.storage.state.rocksdb.TxStateRocksDbSharedStorage;
 import org.apache.ignite.internal.tx.test.TestLocalRwTxCounter;
@@ -469,7 +470,7 @@ private PartialNode startPartialNode(
                 message -> threadPoolsManager.partitionOperationsExecutor()
         );
 
-        var lockManager = new HeapLockManager(systemConfiguration);
+        var lockManager = new HeapLockManager(systemConfiguration, new VolatileTxStateMetaStorage());
 
         var logicalTopologyService = new LogicalTopologyServiceImpl(logicalTopology, cmgManager);
 
@@ -629,6 +630,7 @@ public CompletableFuture<Boolean> invoke(Condition condition, List<Operation> su
                 clusterSvc.topologyService(),
                 replicaService,
                 lockManager,
+                new VolatileTxStateMetaStorage(),
                 clockService,
                 new TransactionIdGenerator(idx),
                 placementDriverManager.placementDriver(),

modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java

@@ -284,6 +284,7 @@
 import org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
 import org.apache.ignite.internal.tx.impl.TransactionInflights;
 import org.apache.ignite.internal.tx.impl.TxManagerImpl;
+import org.apache.ignite.internal.tx.impl.VolatileTxStateMetaStorage;
 import org.apache.ignite.internal.tx.message.TxMessageGroup;
 import org.apache.ignite.internal.tx.storage.state.rocksdb.TxStateRocksDbSharedStorage;
 import org.apache.ignite.internal.vault.VaultManager;
@@ -1038,7 +1039,8 @@ public class IgniteImpl implements Ignite {
 
         var transactionInflights = new TransactionInflights(placementDriverMgr.placementDriver(), clockService);
 
-        LockManager lockMgr = new HeapLockManager(systemConfiguration);
+        VolatileTxStateMetaStorage txStateVolatileStorage = new VolatileTxStateMetaStorage();
+        LockManager lockMgr = new HeapLockManager(systemConfiguration, txStateVolatileStorage);
 
         // TODO: IGNITE-19344 - use nodeId that is validated on join (and probably generated differently).
         txManager = new TxManagerImpl(
@@ -1049,6 +1051,7 @@ public class IgniteImpl implements Ignite {
                 clusterSvc.topologyService(),
                 replicaSvc,
                 lockMgr,
+                txStateVolatileStorage,
                 clockService,
                 new TransactionIdGenerator(() -> clusterSvc.nodeName().hashCode()),
                 placementDriverMgr.placementDriver(),

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/InflightTransactionalOperationTracker.java

@@ -18,10 +18,12 @@
 package org.apache.ignite.internal.sql.engine;
 
 import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
+import static org.apache.ignite.internal.tx.TransactionLogUtils.formatTxInfo;
 import static org.apache.ignite.lang.ErrorGroups.Transactions.TX_ALREADY_FINISHED_ERR;
 
 import org.apache.ignite.internal.sql.engine.exec.TransactionalOperationTracker;
 import org.apache.ignite.internal.tx.InternalTransaction;
+import org.apache.ignite.internal.tx.TxManager;
 import org.apache.ignite.internal.tx.impl.TransactionInflights;
 import org.apache.ignite.tx.TransactionException;
 
@@ -30,9 +32,11 @@
  */
 class InflightTransactionalOperationTracker implements TransactionalOperationTracker {
     private final TransactionInflights delegate;
+    private final TxManager txManager;
 
-    InflightTransactionalOperationTracker(TransactionInflights delegate) {
+    InflightTransactionalOperationTracker(TransactionInflights delegate, TxManager txManager) {
         this.delegate = delegate;
+        this.txManager = txManager;
     }
 
     @Override
@@ -41,7 +45,8 @@ public void registerOperationStart(InternalTransaction tx) {
             boolean result = tx.isReadOnly() ? delegate.addScanInflight(tx.id()) : delegate.track(tx.id());
 
             if (!result) {
-                throw new TransactionException(TX_ALREADY_FINISHED_ERR, format("Transaction is already finished [tx={}]", tx));
+                throw new TransactionException(TX_ALREADY_FINISHED_ERR, format("Transaction is already finished [tx={}, {}]",
+                        tx, formatTxInfo(tx.id(), txManager)));
             }
         }
     }

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java

@@ -251,7 +251,7 @@ public SqlQueryProcessor(
         this.placementDriver = placementDriver;
         this.clusterCfg = clusterCfg;
         this.nodeCfg = nodeCfg;
-        this.txTracker = new InflightTransactionalOperationTracker(transactionInflights);
+        this.txTracker = new InflightTransactionalOperationTracker(transactionInflights, txManager);
         this.txManager = txManager;
         this.commonScheduler = commonScheduler;
         this.killCommandHandler = killCommandHandler;