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 f268a6ee757 IGNITE-29271 Fix flaky ClusterMetricsSelfTest (#13811)
f268a6ee757 is described below
commit f268a6ee757aba639941ec600296aacde199ce3b
Author: Nikita Amelchev <[email protected]>
AuthorDate: Wed Nov 11 09:56:51 2026 +0300
IGNITE-29271 Fix flaky ClusterMetricsSelfTest (#13811)
---
.../ThinClientPartitionAwarenessResourceReleaseTest.java | 1 +
.../ignite/spi/discovery/ClusterMetricsSelfTest.java | 16 +++++++---------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessResourceReleaseTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessResourceReleaseTest.java
index 6ddc0833435..f8f68a943f4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessResourceReleaseTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessResourceReleaseTest.java
@@ -69,6 +69,7 @@ public class ThinClientPartitionAwarenessResourceReleaseTest
extends ThinClientA
public void testResourcesReleasedAfterCacheDestroyed() throws Exception {
int cacheId = CU.cacheId(PART_CUSTOM_AFFINITY_CACHE_NAME);
startGrids(2);
+ awaitPartitionMapExchange();
initClient(getClientConfiguration(0, 1)
.setPartitionAwarenessMapperFactory(new
ClientPartitionAwarenessMapperFactory() {
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSelfTest.java
index 0f7061fbd9e..e6725f68556 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/ClusterMetricsSelfTest.java
@@ -91,16 +91,14 @@ public class ClusterMetricsSelfTest extends
GridCommonAbstractTest {
cache.put(1, 1);
- awaitPartitionMapExchange();
-
int timeout = 5000;
assertTrue(GridTestUtils.waitForCondition(() -> curPMEDuration.value()
== 0, timeout));
assertEquals(0, curBlockingPMEDuration.value());
// There was two blocking exchange: server node start and cache start.
- assertEquals(2, Arrays.stream(durationHistogram.value()).sum());
- assertEquals(2,
Arrays.stream(blockindDurationHistogram.value()).sum());
+ assertTrue(waitForCondition(() ->
Arrays.stream(durationHistogram.value()).sum() == 2, timeout));
+ assertTrue(waitForCondition(() ->
Arrays.stream(blockindDurationHistogram.value()).sum() == 2, timeout));
Lock lock = cache.lock(1);
@@ -119,7 +117,7 @@ public class ClusterMetricsSelfTest extends
GridCommonAbstractTest {
if (client)
assertEquals(0, curBlockingPMEDuration.value());
else
- assertTrue(curBlockingPMEDuration.value() > 0);
+ assertTrue(waitForCondition(() -> curBlockingPMEDuration.value() >
0, timeout));
lock.unlock();
@@ -133,13 +131,13 @@ public class ClusterMetricsSelfTest extends
GridCommonAbstractTest {
if (client) {
// There was non-blocking exchange: client node start.
- assertEquals(3, Arrays.stream(durationHistogram.value()).sum());
- assertEquals(2,
Arrays.stream(blockindDurationHistogram.value()).sum());
+ assertTrue(waitForCondition(() ->
Arrays.stream(durationHistogram.value()).sum() == 3, timeout));
+ assertTrue(waitForCondition(() ->
Arrays.stream(blockindDurationHistogram.value()).sum() == 2, timeout));
}
else {
// There was two blocking exchange: server node start and
rebalance completing.
- assertEquals(4, Arrays.stream(durationHistogram.value()).sum());
- assertEquals(4,
Arrays.stream(blockindDurationHistogram.value()).sum());
+ assertTrue(waitForCondition(() ->
Arrays.stream(durationHistogram.value()).sum() == 4, timeout));
+ assertTrue(waitForCondition(() ->
Arrays.stream(blockindDurationHistogram.value()).sum() == 4, timeout));
}
}
}