(ignite-3) branch main updated: IGNITE-27937 Improve ItBuildIndexWriteIntentsHandlingTest (#7643)

[rpuch]

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

rpuch 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 480618a3318 IGNITE-27937 Improve ItBuildIndexWriteIntentsHandlingTest 
(#7643)
480618a3318 is described below

commit 480618a331842babcadb25e90dfc0c71eeceed4e
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Fri Feb 20 18:03:51 2026 +0400

    IGNITE-27937 Improve ItBuildIndexWriteIntentsHandlingTest (#7643)
---
 .../ItBuildIndexWriteIntentsHandlingTest.java      | 46 ++++++++++++++++------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git 
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexWriteIntentsHandlingTest.java
 
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexWriteIntentsHandlingTest.java
index 64df11ca209..3f545b7f8da 100644
--- 
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexWriteIntentsHandlingTest.java
+++ 
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexWriteIntentsHandlingTest.java
@@ -17,15 +17,15 @@
 
 package org.apache.ignite.internal.index;
 
-import static java.lang.Thread.sleep;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static 
org.apache.ignite.internal.ClusterPerClassIntegrationTest.isIndexAvailable;
 import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
+import static 
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.AVAILABLE;
+import static 
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.BUILDING;
 import static org.apache.ignite.internal.index.IndexBuildTestUtils.INDEX_NAME;
 import static org.apache.ignite.internal.index.IndexBuildTestUtils.TABLE_NAME;
 import static 
org.apache.ignite.internal.index.IndexBuildTestUtils.createTestTable;
 import static 
org.apache.ignite.internal.index.WriteIntentSwitchControl.disableWriteIntentSwitchExecution;
-import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.runAsync;
 import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,7 +34,11 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.ClusterPerTestIntegrationTest;
 import org.apache.ignite.internal.app.IgniteImpl;
+import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
+import org.apache.ignite.internal.hlc.HybridClock;
 import 
org.apache.ignite.internal.index.message.IsNodeFinishedRwTransactionsStartedBeforeRequest;
+import org.apache.ignite.internal.sql.SqlCommon;
 import org.apache.ignite.internal.tx.message.WriteIntentSwitchReplicaRequest;
 import org.apache.ignite.tx.Transaction;
 import org.junit.jupiter.api.Test;
@@ -55,16 +59,11 @@ class ItBuildIndexWriteIntentsHandlingTest extends 
ClusterPerTestIntegrationTest
 
         createIndex(INDEX_NAME);
 
-        // Allow cleanup to be completed after some time. This is required 
because transaction abortion (that is triggered by
-        // write intent resolution that is done in index build task) is 
completed only after successful txn cleanup, and the index
-        // can't become available before building is completed.
-        runAsync(() -> {
-            sleep(5_000);
-            runningNodesIter().forEach(IgniteImpl::stopDroppingMessages);
-        });
+        waitTillIndexAtLeastStartsBeingBuilt();
+        enableWriteIntentSwitchExecution();
 
         await("Index did not become available in time")
-                .atMost(30, SECONDS)
+                .atMost(20, SECONDS)
                 .until(() -> 
isIndexAvailable(unwrapIgniteImpl(cluster.aliveNode()), INDEX_NAME));
 
         verifyNoNodesHaveAnythingInIndex();
@@ -102,7 +101,10 @@ class ItBuildIndexWriteIntentsHandlingTest extends 
ClusterPerTestIntegrationTest
         // the pre-build wait.
         cluster.restartNode(txCoordinatorOrdinal);
 
-        await("Index did not become available in time")
+        waitTillIndexAtLeastStartsBeingBuilt();
+        enableWriteIntentSwitchExecution();
+
+        await("Index should become available in time")
                 .atMost(10, SECONDS)
                 .until(() -> 
isIndexAvailable(unwrapIgniteImpl(cluster.aliveNode()), INDEX_NAME));
 
@@ -123,4 +125,26 @@ class ItBuildIndexWriteIntentsHandlingTest extends 
ClusterPerTestIntegrationTest
     private void createIndex(String indexName) {
         IndexBuildTestUtils.createIndex(cluster, indexName);
     }
+
+    private void waitTillIndexAtLeastStartsBeingBuilt() {
+        await("Index should at least start being built in time")
+                .atMost(10, SECONDS)
+                .until(() -> 
isIndexBuildingOrAvailable(unwrapIgniteImpl(cluster.aliveNode()), INDEX_NAME));
+    }
+
+    private static boolean isIndexBuildingOrAvailable(IgniteImpl ignite, 
String indexName) {
+        CatalogManager catalogManager = ignite.catalogManager();
+        HybridClock clock = ignite.clock();
+
+        CatalogIndexDescriptor indexDescriptor = 
catalogManager.activeCatalog(clock.nowLong())
+                .aliveIndex(SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
+
+        return indexDescriptor != null && (indexDescriptor.status() == 
BUILDING || indexDescriptor.status() == AVAILABLE);
+    }
+
+    private void enableWriteIntentSwitchExecution() {
+        cluster.runningNodes().forEach(ignite -> {
+            unwrapIgniteImpl(ignite).stopDroppingMessages();
+        });
+    }
 }