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

NSAmelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 24d22b1499d IGNITE-29267 Fix flaky 
SnapshotCompatibilityTest#testSnapshotRestore (#13808)
24d22b1499d is described below

commit 24d22b1499dc62f8be365206ce98ef081fd53ec0
Author: Nikita Amelchev <[email protected]>
AuthorDate: Tue Nov 10 20:36:21 2026 +0300

    IGNITE-29267 Fix flaky SnapshotCompatibilityTest#testSnapshotRestore 
(#13808)
---
 .../cache/persistence/snapshot/SnapshotRestoreProcess.java       | 2 +-
 .../snapshot/IgniteClusterSnapshotRestoreSelfTest.java           | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
index f36bd768665..8dea2e1cc19 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java
@@ -275,7 +275,7 @@ public class SnapshotRestoreProcess {
 
             DiscoveryDataClusterState clusterState = 
ctx.state().clusterState();
 
-            if (clusterState.state() != ClusterState.ACTIVE || 
clusterState.transition())
+            if (clusterState.state() != ClusterState.ACTIVE)
                 throw new IgniteException(OP_REJECT_MSG + "The cluster should 
be active.");
 
             if (!clusterState.hasBaselineTopology())
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
index 09c67e7ece7..c37ebd31886 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
@@ -857,15 +857,6 @@ public class IgniteClusterSnapshotRestoreSelfTest extends 
IgniteClusterSnapshotR
 
         ign.cluster().state(ClusterState.ACTIVE);
 
-        GridTestUtils.waitForCondition(() -> {
-            for (int n = 0; n < nodes; n++) {
-                if (grid(n).context().state().clusterState().transition())
-                    return false;
-            }
-
-            return true;
-        }, getTestTimeout());
-
         ign.snapshot().restoreSnapshot(SNAPSHOT_NAME, 
Collections.singleton(DEFAULT_CACHE_NAME)).get(TIMEOUT);
 
         assertCacheKeys(ign.cache(DEFAULT_CACHE_NAME), keysCnt);

Reply via email to