You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vp...@apache.org on 2025/02/24 09:15:22 UTC

(ignite-3) branch main updated: IGNITE-24156 Tx states overconsume heap (#5252)

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

vpyatkov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 6e0234aa393 IGNITE-24156 Tx states overconsume heap (#5252)
6e0234aa393 is described below

commit 6e0234aa3939c0f499a805b4928cc66b5e59bcfc
Author: Vladislav Pyatkov <vl...@gmail.com>
AuthorDate: Mon Feb 24 12:15:17 2025 +0300

    IGNITE-24156 Tx states overconsume heap (#5252)
---
 .../tx/distributed/ItTxResourcesVacuumTest.java    | 21 +++++++-
 .../org/apache/ignite/internal/tx/TxStateMeta.java |  8 ++-
 .../tx/impl/VolatileTxStateMetaStorage.java        | 63 ++++++++--------------
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
index 94b49776135..dc7a9b4b009 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
@@ -63,6 +63,7 @@ import org.apache.ignite.internal.testframework.WithSystemProperty;
 import org.apache.ignite.internal.thread.IgniteThreadFactory;
 import org.apache.ignite.internal.thread.ThreadOperation;
 import org.apache.ignite.internal.tx.TransactionMeta;
+import org.apache.ignite.internal.tx.TxState;
 import org.apache.ignite.internal.tx.TxStateMeta;
 import org.apache.ignite.internal.tx.configuration.TransactionConfiguration;
 import org.apache.ignite.internal.tx.configuration.TransactionExtensionConfiguration;
@@ -70,6 +71,7 @@ import org.apache.ignite.internal.tx.impl.TxManagerImpl;
 import org.apache.ignite.internal.tx.message.TxCleanupMessage;
 import org.apache.ignite.internal.tx.message.TxFinishReplicaRequest;
 import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage;
+import org.apache.ignite.internal.util.FastTimestamps;
 import org.apache.ignite.table.RecordView;
 import org.apache.ignite.table.Tuple;
 import org.apache.ignite.tx.Transaction;
@@ -1054,7 +1056,24 @@ public class ItTxResourcesVacuumTest extends ClusterPerTestIntegrationTest {
     @Nullable
     private static TransactionMeta volatileTxState(IgniteImpl node, UUID txId) {
         TxManagerImpl txManager = (TxManagerImpl) node.txManager();
-        return txManager.stateMeta(txId);
+
+        TxStateMeta txInMemoryState = txManager.stateMeta(txId);
+
+        if (txInMemoryState == null) {
+            return null;
+        }
+
+        if (TxState.isFinalState(txInMemoryState.txState())) {
+            long current = FastTimestamps.coarseCurrentTimeMillis();
+
+            Long initialTs = txInMemoryState.initialVacuumObservationTimestamp();
+
+            assertNotNull(initialTs);
+
+            assertTrue(current >= initialTs);
+        }
+
+        return txInMemoryState;
     }
 
     @Nullable
diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/TxStateMeta.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/TxStateMeta.java
index 3a28aaff4f8..2afc19014c2 100644
--- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/TxStateMeta.java
+++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/TxStateMeta.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.tx;
 import static org.apache.ignite.internal.replicator.message.ReplicaMessageUtils.toTablePartitionIdMessage;
 import static org.apache.ignite.internal.tx.TxState.ABANDONED;
 import static org.apache.ignite.internal.tx.TxState.checkTransitionCorrectness;
+import static org.apache.ignite.internal.util.FastTimestamps.coarseCurrentTimeMillis;
 
 import java.util.UUID;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
@@ -122,8 +123,13 @@ public class TxStateMeta implements TransactionMeta {
         this.commitPartitionId = commitPartitionId;
         this.commitTimestamp = commitTimestamp;
         this.tx = tx;
-        this.initialVacuumObservationTimestamp = initialVacuumObservationTimestamp;
         this.cleanupCompletionTimestamp = cleanupCompletionTimestamp;
+
+        if (initialVacuumObservationTimestamp != null) {
+            this.initialVacuumObservationTimestamp = initialVacuumObservationTimestamp;
+        } else {
+            this.initialVacuumObservationTimestamp = TxState.isFinalState(txState) ? coarseCurrentTimeMillis() : null;
+        }
     }
 
     /**
diff --git a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/VolatileTxStateMetaStorage.java b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/VolatileTxStateMetaStorage.java
index 32dcfb55fbb..16826cc2cc3 100644
--- a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/VolatileTxStateMetaStorage.java
+++ b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/VolatileTxStateMetaStorage.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.tx.impl;
 
-import static java.lang.Math.max;
 import static org.apache.ignite.internal.tx.TxState.PENDING;
 import static org.apache.ignite.internal.tx.TxState.checkTransitionCorrectness;
 
@@ -151,7 +150,6 @@ public class VolatileTxStateMetaStorage {
         LOG.info("Vacuum started [vacuumObservationTimestamp={}, txnResourceTtl={}].", vacuumObservationTimestamp, txnResourceTtl);
 
         AtomicInteger vacuumizedTxnsCount = new AtomicInteger(0);
-        AtomicInteger markedAsInitiallyDetectedTxnsCount = new AtomicInteger(0);
         AtomicInteger alreadyMarkedTxnsCount = new AtomicInteger(0);
         AtomicInteger skippedForFurtherProcessingUnfinishedTxnsCount = new AtomicInteger(0);
 
@@ -171,39 +169,34 @@ public class VolatileTxStateMetaStorage {
                 } else if (TxState.isFinalState(meta0.txState())) {
                     Long initialVacuumObservationTimestamp = meta0.initialVacuumObservationTimestamp();
 
-                    if (initialVacuumObservationTimestamp == null && txnResourceTtl > 0) {
-                        markedAsInitiallyDetectedTxnsCount.incrementAndGet();
+                    Long cleanupCompletionTimestamp = meta0.cleanupCompletionTimestamp();
 
-                        return markInitialVacuumObservationTimestamp(meta0, vacuumObservationTimestamp);
-                    } else {
-                        Long cleanupCompletionTimestamp = meta0.cleanupCompletionTimestamp();
-
-                        boolean shouldBeVacuumized = shouldBeVacuumized(initialVacuumObservationTimestamp,
-                                cleanupCompletionTimestamp, txnResourceTtl, vacuumObservationTimestamp);
+                    boolean shouldBeVacuumized = shouldBeVacuumized(initialVacuumObservationTimestamp,
+                            cleanupCompletionTimestamp, txnResourceTtl, vacuumObservationTimestamp);
 
-                        if (shouldBeVacuumized) {
-                            if (meta0.commitPartitionId() == null) {
-                                vacuumizedTxnsCount.incrementAndGet();
+                    if (shouldBeVacuumized) {
+                        if (meta0.commitPartitionId() == null) {
+                            vacuumizedTxnsCount.incrementAndGet();
 
-                                return null;
-                            } else {
-                                // TODO https://issues.apache.org/jira/browse/IGNITE-24343
-                                // Should be changed to ZonePartitionId.
-                                Set<VacuumizableTx> ids = txIds.computeIfAbsent(meta0.commitPartitionId(), k -> new HashSet<>());
-                                ids.add(new VacuumizableTx(txId, cleanupCompletionTimestamp));
-
-                                if (cleanupCompletionTimestamp != null) {
-                                    cleanupCompletionTimestamps.put(txId, cleanupCompletionTimestamp);
-                                }
+                            return null;
+                        } else {
+                            // TODO https://issues.apache.org/jira/browse/IGNITE-24343
+                            // Should be changed to ZonePartitionId.
+                            Set<VacuumizableTx> ids = txIds.computeIfAbsent(meta0.commitPartitionId(), k -> new HashSet<>());
+                            ids.add(new VacuumizableTx(txId, cleanupCompletionTimestamp));
 
-                                return meta0;
+                            if (cleanupCompletionTimestamp != null) {
+                                cleanupCompletionTimestamps.put(txId, cleanupCompletionTimestamp);
                             }
-                        } else {
-                            alreadyMarkedTxnsCount.incrementAndGet();
 
                             return meta0;
                         }
+                    } else {
+                        alreadyMarkedTxnsCount.incrementAndGet();
+
+                        return meta0;
                     }
+
                 }
 
                 skippedForFurtherProcessingUnfinishedTxnsCount.incrementAndGet();
@@ -235,14 +228,12 @@ public class VolatileTxStateMetaStorage {
                                     + "txnResourceTtl={}, "
                                     + "vacuumizedTxnsCount={}, "
                                     + "vacuumizedPersistentTxnStatesCount={}, "
-                                    + "markedAsInitiallyDetectedTxnsCount={}, "
                                     + "alreadyMarkedTxnsCount={}, "
                                     + "skippedForFurtherProcessingUnfinishedTxnsCount={}].",
                             vacuumObservationTimestamp,
                             txnResourceTtl,
                             vacuumizedTxnsCount,
                             vacuumResult.vacuumizedPersistentTxnStatesCount,
-                            markedAsInitiallyDetectedTxnsCount,
                             alreadyMarkedTxnsCount,
                             skippedForFurtherProcessingUnfinishedTxnsCount
                     );
@@ -254,20 +245,8 @@ public class VolatileTxStateMetaStorage {
         return Collections.unmodifiableMap(txStateMap);
     }
 
-    private static TxStateMeta markInitialVacuumObservationTimestamp(TxStateMeta meta, long vacuumObservationTimestamp) {
-        return new TxStateMeta(
-                meta.txState(),
-                meta.txCoordinatorId(),
-                meta.commitPartitionId(),
-                meta.commitTimestamp(),
-                meta.tx(),
-                vacuumObservationTimestamp,
-                meta.cleanupCompletionTimestamp()
-        );
-    }
-
     private static boolean shouldBeVacuumized(
-            @Nullable Long initialVacuumObservationTimestamp,
+            Long initialVacuumObservationTimestamp,
             @Nullable Long cleanupCompletionTimestamp,
             long txnResourceTtl,
             long vacuumObservationTimestamp) {
@@ -281,7 +260,7 @@ public class VolatileTxStateMetaStorage {
         if (cleanupCompletionTimestamp == null) {
             return initialVacuumObservationTimestamp + txnResourceTtl < vacuumObservationTimestamp;
         } else {
-            return max(cleanupCompletionTimestamp, initialVacuumObservationTimestamp) + txnResourceTtl < vacuumObservationTimestamp;
+            return cleanupCompletionTimestamp + txnResourceTtl < vacuumObservationTimestamp;
         }
     }
 }