Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IGNITE-8650: ZookeeperDiscovery testClientReconnect is flaky in master #4704

Closed
wants to merge 5 commits into from
Closed

IGNITE-8650: ZookeeperDiscovery testClientReconnect is flaky in master #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb1c208
adds some logs
avplatonov Sep 7, 2018
ac970f1
add assertion to alive clients list
avplatonov Sep 7, 2018
ebd6d27
ignore message without current node while reconnecting
avplatonov Sep 10, 2018
d55aac1
remove specific to task logging
avplatonov Sep 10, 2018
0330b0b
minor fix
avplatonov Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ private void reconnectMultinode(boolean longHist) throws Exception {

ClusterGroup grp = client.cluster().forCacheNodes(DEFAULT_CACHE_NAME);

assertEquals(CLIENTS + srvNodes, grp.nodes().size());
assertEquals(expNodes, grp.nodes().size());

grp = client.cluster().forClientNodes(DEFAULT_CACHE_NAME);

Expand Down
4 changes: 3 additions & 1 deletion ...per/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,9 @@ private void checkClientsStatus(final List<String> aliveNodes) throws Exception
}
}

assert !aliveClients.isEmpty();
// This situation may appear while reconnection and this callback can be skipped.
if(!aliveClients.containsKey(locInternalOrder))
return;

Map.Entry<Long, String> oldest = aliveClients.firstEntry();

Expand Down