FewJuho commented on code in PR #11855:
URL: https://github.com/apache/ignite/pull/11855#discussion_r1971852667
##########
modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java:
##########
@@ -631,43 +631,44 @@ synchronized void initChannelHolders() {
return;
}
- // Add connected channels to the list to avoid unnecessary reconnects,
unless address finder is used.
- if (holders != null && clientCfg.getAddressesFinder() == null) {
- // Do not modify the original list.
- newAddrs = new ArrayList<>(newAddrs);
-
- for (ClientChannelHolder h : holders) {
- ClientChannel ch = h.ch;
-
- if (ch != null && !ch.closed())
- newAddrs.add(h.getAddresses());
- }
- }
-
Map<InetSocketAddress, ClientChannelHolder> curAddrs = new HashMap<>();
- Set<InetSocketAddress> newAddrsSet =
newAddrs.stream().flatMap(Collection::stream).collect(Collectors.toSet());
+ Set<List<InetSocketAddress>> validAddrsSet = new HashSet<>(newAddrs);
+ // Add connected channels to the list to avoid unnecessary reconnects,
unless address finder is used.
// Close obsolete holders or map old but valid addresses to holders
if (holders != null) {
for (ClientChannelHolder h : holders) {
- boolean found = false;
+ ClientChannel ch = h.ch;
- for (InetSocketAddress addr : h.getAddresses()) {
- // If new endpoints contain at least one of channel
addresses, don't close this channel.
- if (newAddrsSet.contains(addr)) {
- ClientChannelHolder oldHld =
curAddrs.putIfAbsent(addr, h);
+ if (clientCfg.getAddressesFinder() == null && ch != null &&
!ch.closed()) {
+ validAddrsSet.add(h.getAddresses());
+ for (InetSocketAddress addr : h.getAddresses())
+ curAddrs.putIfAbsent(addr, h);
+ }
- if (oldHld == null || oldHld == h) // If not duplicate.
- found = true;
+ boolean found = false;
+
+ // If new endpoints contain at least one of channel addresses,
don't close this channel.
+ for (List<InetSocketAddress> addrList : validAddrsSet) {
+ if (addrList.containsAll(h.getAddresses())) {
Review Comment:
It's not optimal; we can wrap it in "new HashSet<>(addrList).containsAll"
Is it worth it?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
