From 888e24ede328f506174c86282cb0f0486ef0c712 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Tue, 3 Mar 2026 18:32:16 +0300 Subject: [PATCH 1/5] IGNITE-28049 Fix DurableBackgroundTasksProcessorSelfTest#testConvertAfterRestoreIfNeeded --- .../localtask/DurableBackgroundTasksProcessorSelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java index 8c1df0ee6a5f7..81dba4ea78778 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java @@ -49,6 +49,7 @@ import static org.apache.ignite.testframework.GridTestUtils.assertThrows; import static org.apache.ignite.testframework.GridTestUtils.getFieldValue; import static org.apache.ignite.testframework.GridTestUtils.runAsync; +import static org.apache.ignite.testframework.GridTestUtils.waitForCondition; /** * Class for testing the {@link DurableBackgroundTasksProcessor}. @@ -535,7 +536,7 @@ private void checkStateAndMetaStorage( if (expState == null) assertNull(taskState); else { - assertEquals(expState, taskState.state()); + assertTrue(waitForCondition(() -> expState.equals(taskState.state()), getTestTimeout())); assertEquals(expSaved, taskState.saved()); assertEquals(expDone, taskState.outFuture().isDone()); From 254934c09c12753ead2af94c1cd67eafc97fd6a7 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Fri, 6 Mar 2026 13:38:27 +0300 Subject: [PATCH 2/5] IGNITE-280049 Replace equals with == --- .../localtask/DurableBackgroundTasksProcessorSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java index 81dba4ea78778..97e2e15c37dae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java @@ -536,7 +536,7 @@ private void checkStateAndMetaStorage( if (expState == null) assertNull(taskState); else { - assertTrue(waitForCondition(() -> expState.equals(taskState.state()), getTestTimeout())); + assertTrue(waitForCondition(() -> expState == taskState.state(), getTestTimeout())); assertEquals(expSaved, taskState.saved()); assertEquals(expDone, taskState.outFuture().isDone()); From 7698b9637c3c477f8e16ebe915c64fdd53cea5b6 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Fri, 6 Mar 2026 14:13:06 +0300 Subject: [PATCH 3/5] IGNITE-28049 Fix assertion for number of tasks --- .../localtask/DurableBackgroundTasksProcessorSelfTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java index 97e2e15c37dae..1ab7b2c87183e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java @@ -346,7 +346,10 @@ public void testConvertAfterRestoreIfNeeded() throws Exception { n = startGrid(0); - assertEquals(3, tasks(n).size()); + int tasks = tasks(n).size(); + + assertTrue("Expected 3 tasks after restore, or 2 if completed converted task was already cleaned by checkpoint", + tasks == 2 || tasks == 3); checkStateAndMetaStorage(n, t0, COMPLETED, true, true, false); checkStateAndMetaStorage(n, t1, INIT, true, false, false); From 5196c377daef905e91f345369de870f33c84fe17 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Fri, 6 Mar 2026 14:15:41 +0300 Subject: [PATCH 4/5] IGNITE-28049 Decrease wait timeout to 5 --- .../localtask/DurableBackgroundTasksProcessorSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java index 1ab7b2c87183e..8979baabab1d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java @@ -539,7 +539,7 @@ private void checkStateAndMetaStorage( if (expState == null) assertNull(taskState); else { - assertTrue(waitForCondition(() -> expState == taskState.state(), getTestTimeout())); + assertTrue(waitForCondition(() -> expState == taskState.state(), 5)); assertEquals(expSaved, taskState.saved()); assertEquals(expDone, taskState.outFuture().isDone()); From 56a0b9af663153227ec50b642c35a61202b29d67 Mon Sep 17 00:00:00 2001 From: chesnokoff Date: Fri, 6 Mar 2026 14:46:07 +0300 Subject: [PATCH 5/5] IGNITE-28049 Update timeout --- .../localtask/DurableBackgroundTasksProcessorSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java index 8979baabab1d7..6007b079094c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/localtask/DurableBackgroundTasksProcessorSelfTest.java @@ -539,7 +539,7 @@ private void checkStateAndMetaStorage( if (expState == null) assertNull(taskState); else { - assertTrue(waitForCondition(() -> expState == taskState.state(), 5)); + assertTrue(waitForCondition(() -> expState == taskState.state(), 1_000)); assertEquals(expSaved, taskState.saved()); assertEquals(expDone, taskState.outFuture().isDone());