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/10/23 12:10:08 UTC
(ignite-3) branch main updated: IGNITE-26802 Flaky ItTxDistributedTestThreeNodesThreeReplicas.testPrimaryReplicaDirectUpdateForExplicitTxn (#6833)
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 ea4f4bf8b80 IGNITE-26802 Flaky ItTxDistributedTestThreeNodesThreeReplicas.testPrimaryReplicaDirectUpdateForExplicitTxn (#6833)
ea4f4bf8b80 is described below
commit ea4f4bf8b80ff1512afaa1d8c374655003ecbd57
Author: Vladislav Pyatkov <vl...@gmail.com>
AuthorDate: Thu Oct 23 15:10:01 2025 +0300
IGNITE-26802 Flaky ItTxDistributedTestThreeNodesThreeReplicas.testPrimaryReplicaDirectUpdateForExplicitTxn (#6833)
---
.../ignite/internal/placementdriver/PlacementDriverManagerTest.java | 4 ++--
.../distributed/ItTxDistributedTestThreeNodesThreeReplicas.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
index 1550f2ff94e..7d23b6e2717 100644
--- a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
+++ b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
@@ -570,9 +570,9 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
assertFalse(leaseExpirationMap.get(groupIds.get(0)).get());
assertFalse(leaseExpirationMap.get(groupIds.get(1)).get());
- metaStorageManager.remove(
+ assertThat(metaStorageManager.remove(
fromString((enabledColocation ? ZoneRebalanceUtil.STABLE_ASSIGNMENTS_PREFIX : STABLE_ASSIGNMENTS_PREFIX) + groupIds.get(0))
- );
+ ), willCompleteSuccessfully());
assertTrue(waitForCondition(() -> {
CompletableFuture<Entry> fut = metaStorageManager.get(PLACEMENTDRIVER_LEASES_KEY);
diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestThreeNodesThreeReplicas.java b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestThreeNodesThreeReplicas.java
index 44caf63f7ad..b5978629401 100644
--- a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestThreeNodesThreeReplicas.java
+++ b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestThreeNodesThreeReplicas.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.apache.ignite.internal.table.TxAbstractTest;
import org.apache.ignite.internal.testframework.IgniteTestUtils;
import org.apache.ignite.internal.tx.impl.ReadWriteTransactionImpl;
+import org.apache.ignite.internal.util.CollectionUtils;
import org.apache.ignite.raft.jraft.rpc.RpcRequests;
import org.apache.ignite.raft.jraft.rpc.RpcRequests.AppendEntriesRequest;
import org.junit.jupiter.api.AfterEach;
@@ -84,7 +85,7 @@ public class ItTxDistributedTestThreeNodesThreeReplicas extends TxAbstractTest {
if (msg instanceof RpcRequests.AppendEntriesRequest) {
RpcRequests.AppendEntriesRequest tmp = (AppendEntriesRequest) msg;
- if (tmp.entriesList() != null && !tmp.entriesList().isEmpty() && tmp.data() != null) {
+ if (!CollectionUtils.nullOrEmpty(tmp.entriesList()) && tmp.data() != null) {
return true;
}
}
@@ -94,7 +95,7 @@ public class ItTxDistributedTestThreeNodesThreeReplicas extends TxAbstractTest {
ReadWriteTransactionImpl tx = (ReadWriteTransactionImpl) igniteTransactions.begin();
CompletableFuture<Void> fut = accounts.recordView().upsertAsync(tx, makeValue(1, 100.));
- assertTrue(IgniteTestUtils.waitForCondition(() -> server.blockedMessages(new RaftNodeId(groupId, leader)).size() == 2, 10000),
+ assertTrue(IgniteTestUtils.waitForCondition(() -> !server.blockedMessages(new RaftNodeId(groupId, leader)).isEmpty(), 10000),
"Failed to wait for blocked messages");
// Update must complete now despite the blocked replication protocol.