Skip to content

Commit 6dac5ae

Browse files
committed
IGNITE-26965 Fixed flaky ReliabilityTest#testFailover test.
1 parent 4484d80 commit 6dac5ae

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class LocalIgniteCluster implements AutoCloseable {
4141
private static final Random rnd = new Random();
4242

4343
/** Servers. */
44-
private final List<Ignite> srvs = new ArrayList<>();
44+
public final List<Ignite> srvs = new ArrayList<>();
4545

4646
/** Configurations of the failed servers. */
4747
private final List<NodeConfiguration> failedCfgs = new ArrayList<>();

modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,20 @@ public void testFailover() throws Exception {
161161
try (QueryCursor<Cache.Entry<Integer, String>> cur = cache.query(qry)) {
162162
List<Cache.Entry<Integer, String>> res = cur.getAll();
163163

164-
assertEquals("Unexpected number of entries", data.size(), res.size());
165-
166164
Map<Integer, String> act = res.stream()
167-
.collect(Collectors.toMap(Cache.Entry::getKey, Cache.Entry::getValue));
165+
.collect(Collectors.toMap(Cache.Entry::getKey, Cache.Entry::getValue));
166+
167+
Map<Integer, Object> failover = null;
168+
169+
if (data.size() != res.size()) {
170+
failover = data.entrySet().stream()
171+
.collect(Collectors.toMap(
172+
Map.Entry::getKey,
173+
e -> cluster.srvs.get(0).cache("testFailover").get(e.getKey()))
174+
);
175+
}
176+
177+
assertEquals("Unexpected number of entries " + act + " " + failover, data.size(), res.size());
168178

169179
assertEquals("Unexpected entries", data, act);
170180
}
@@ -770,8 +780,6 @@ private void waitRebalanceFinished() throws IgniteInterruptedCheckedException, I
770780
));
771781
}
772782
}
773-
774-
U.sleep(5000);
775783
}
776784

777785
/** {@inheritDoc} */

0 commit comments

Comments
 (0)