(ignite-3) branch main updated: IGNITE-22027 Fix ItPrimaryReplicaChoiceTest#testPrimaryChangeLongHandling (#3593)

[sanpwc]

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

sanpwc 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 2dd41ef593 IGNITE-22027 Fix 
ItPrimaryReplicaChoiceTest#testPrimaryChangeLongHandling (#3593)
2dd41ef593 is described below

commit 2dd41ef5935c9710db4e48334b3f41df0d27bbbc
Author: Alexander Lapin <lapin1...@gmail.com>
AuthorDate: Thu Apr 11 16:41:07 2024 +0300

    IGNITE-22027 Fix ItPrimaryReplicaChoiceTest#testPrimaryChangeLongHandling 
(#3593)
---
 .../java/org/apache/ignite/internal/table/NodeUtils.java          | 5 +++--
 .../table/distributed/replicator/TransactionStateResolver.java    | 2 +-
 .../ignite/internal/tx/impl/VolatileTxStateMetaStorage.java       | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/table/NodeUtils.java
 
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/table/NodeUtils.java
index 6dfb2ff26f..cf2a29c5b9 100644
--- 
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/table/NodeUtils.java
+++ 
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/table/NodeUtils.java
@@ -71,7 +71,7 @@ public class NodeUtils {
         if (preferablePrimary == null) {
             preferablePrimary = nodes.stream()
                     .map(IgniteImpl::name)
-                    .filter(n -> n.equals(currentLeaseholder.getLeaseholder()))
+                    .filter(n -> 
!n.equals(currentLeaseholder.getLeaseholder()))
                     .findFirst()
                     .orElseThrow();
         }
@@ -93,7 +93,8 @@ public class NodeUtils {
             return 
newPrimaryReplica.getLeaseholder().equals(finalPreferablePrimary);
         }, 10_000));
 
-        LOG.info("Primary replica moved successfully.");
+        LOG.info("Primary replica moved successfully from [{}] to [{}].",
+                currentLeaseholder.getLeaseholder(), finalPreferablePrimary);
 
         return finalPreferablePrimary;
     }
diff --git 
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/TransactionStateResolver.java
 
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/TransactionStateResolver.java
index c66bb689e1..4e28062513 100644
--- 
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/TransactionStateResolver.java
+++ 
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/TransactionStateResolver.java
@@ -49,7 +49,7 @@ import org.apache.ignite.network.ClusterNodeResolver;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Placement driver.
+ * Helper class that allows to resolve transaction state mainly for the 
purpose of write intent resolution.
  */
 public class TransactionStateResolver {
     /** Tx messages factory. */
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 3dbbc4462d..6997173978 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
@@ -124,7 +124,7 @@ public class VolatileTxStateMetaStorage {
         AtomicInteger vacuumizedTxnsCount = new AtomicInteger(0);
         AtomicInteger markedAsInitiallyDetectedTxnsCount = new 
AtomicInteger(0);
         AtomicInteger alreadyMarkedTxnsCount = new AtomicInteger(0);
-        AtomicInteger skippedFotFurtherProcessingUnfinishedTxnsCount = new 
AtomicInteger(0);
+        AtomicInteger skippedForFurtherProcessingUnfinishedTxnsCount = new 
AtomicInteger(0);
 
         txStateMap.forEach((txId, meta) -> {
             txStateMap.computeIfPresent(txId, (txId0, meta0) -> {
@@ -149,20 +149,20 @@ public class VolatileTxStateMetaStorage {
                         return meta0;
                     }
                 } else {
-                    
skippedFotFurtherProcessingUnfinishedTxnsCount.incrementAndGet();
+                    
skippedForFurtherProcessingUnfinishedTxnsCount.incrementAndGet();
                     return meta0;
                 }
             });
         });
 
         LOG.info("Vacuum finished [vacuumObservationTimestamp={}, 
txnResourceTtl={}, vacuumizedTxnsCount={},"
-                + " markedAsInitiallyDetectedTxnsCount={}, 
alreadyMarkedTxnsCount={}, skippedFotFurtherProcessingUnfinishedTxnsCount={}].",
+                + " markedAsInitiallyDetectedTxnsCount={}, 
alreadyMarkedTxnsCount={}, skippedForFurtherProcessingUnfinishedTxnsCount={}].",
                 vacuumObservationTimestamp,
                 txnResourceTtl,
                 vacuumizedTxnsCount,
                 markedAsInitiallyDetectedTxnsCount,
                 alreadyMarkedTxnsCount,
-                skippedFotFurtherProcessingUnfinishedTxnsCount
+                skippedForFurtherProcessingUnfinishedTxnsCount
         );
     }
 }