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 33befc66e3f IGNITE-26310 Fix flaky
DataNodesManagerTest#removeNodesWithScheduledScaleDown (#6489)
33befc66e3f is described below
commit 33befc66e3f9119b066c71778f136917a5396040
Author: Denis Chudov <[email protected]>
AuthorDate: Fri Aug 29 13:35:35 2025 +0300
IGNITE-26310 Fix flaky
DataNodesManagerTest#removeNodesWithScheduledScaleDown (#6489)
---
.../distributionzones/DataNodesManagerTest.java | 25 +++++++++++++++-------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DataNodesManagerTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DataNodesManagerTest.java
index 7dd2110e6a5..9d22d1024a8 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DataNodesManagerTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DataNodesManagerTest.java
@@ -246,7 +246,7 @@ public class DataNodesManagerTest extends
BaseIgniteAbstractTest {
@Test
public void addNodesWithScheduledScaleUp() throws InterruptedException {
- alterZone(ZONE_NAME_1, 1, null, null);
+ alterZone(ZONE_NAME_1, 5, null, null);
addNodes(Set.of(C));
@@ -292,7 +292,7 @@ public class DataNodesManagerTest extends
BaseIgniteAbstractTest {
@Test
public void removeNodesWithScheduledScaleDown() throws
InterruptedException {
- alterZone(ZONE_NAME_1, null, 1, null);
+ alterZone(ZONE_NAME_1, null, 5, null);
removeNodes(Set.of(A));
@@ -534,11 +534,11 @@ public class DataNodesManagerTest extends
BaseIgniteAbstractTest {
CompletableFuture<Set<String>> dataNodesFuture =
dataNodesManager.dataNodes(zoneId, clock.now());
assertThat(dataNodesFuture, willSucceedFast());
return dataNodesFuture.join().equals(expectedNodes);
- }, 5000);
+ }, 10_000);
if (!success) {
- System.out.println("Expected: " + expectedNodes);
- System.out.println("Actual: " + dataNodesManager.dataNodes(zoneId,
clock.now()).join());
+ log.info("Expected: " + expectedNodes);
+ log.info("Actual: " + dataNodesManager.dataNodes(zoneId,
clock.now()).join());
}
assertTrue(success);
@@ -564,10 +564,18 @@ public class DataNodesManagerTest extends
BaseIgniteAbstractTest {
}
private void assertScaleUpScheduledOrDone(String zoneName) throws
InterruptedException {
- assertTrue(waitForCondition(() -> {
+ boolean success = waitForCondition(() -> {
ZoneTimerSchedule schedule =
dataNodesManager.zoneTimers(zoneId(zoneName)).scaleUp;
return schedule.taskIsScheduled() || schedule.taskIsDone();
- }, 2000));
+ }, 2000);
+
+ if (!success) {
+ ZoneTimerSchedule schedule =
dataNodesManager.zoneTimers(zoneId(zoneName)).scaleUp;
+ log.info("Unsuccessful schedule [taskIsScheduled={},
taskIsCancelled={}, taskIsDone={}]."
+ + schedule.taskIsScheduled(), schedule.taskIsCancelled(),
schedule.taskIsDone());
+ }
+
+ assertTrue(success);
}
private void assertScaleUpNotScheduled(String zoneName) throws
InterruptedException {
@@ -582,7 +590,8 @@ public class DataNodesManagerTest extends
BaseIgniteAbstractTest {
if (!success) {
ZoneTimerSchedule schedule =
dataNodesManager.zoneTimers(zoneId(zoneName)).scaleDown;
- System.out.println(schedule);
+ log.info("Unsuccessful schedule [taskIsScheduled={},
taskIsCancelled={}, taskIsDone={}]."
+ + schedule.taskIsScheduled(), schedule.taskIsCancelled(),
schedule.taskIsDone());
}
assertTrue(success);