yandrey321 commented on code in PR #10747:
URL: https://github.com/apache/ozone/pull/10747#discussion_r3580037446
##########
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java:
##########
@@ -267,39 +265,25 @@ public void close() {
return;
}
+ // Use shutdownNow() (not the graceful shutdown()) so in-flight RPCs are
+ // cancelled and the channel terminates immediately. close() is frequently
+ // invoked from cache eviction while the XceiverClientManager clientCache
+ // monitor is held (HDDS-15849); a blocking graceful drain there serializes
+ // every concurrent acquireClient()/releaseClient() call.
for (ChannelInfo channelInfo : dnChannelInfoMap.values()) {
- channelInfo.getChannel().shutdown();
- }
-
- final long maxWaitNanos =
TimeUnit.SECONDS.toNanos(SHUTDOWN_WAIT_MAX_SECONDS);
- long deadline = System.nanoTime() + maxWaitNanos;
- List<ManagedChannel> nonTerminatedChannels = dnChannelInfoMap.values()
- .stream()
- .map(ChannelInfo::getChannel)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
-
- while (!nonTerminatedChannels.isEmpty() && System.nanoTime() < deadline) {
- nonTerminatedChannels.removeIf(ManagedChannel::isTerminated);
+ ManagedChannel channel = channelInfo.getChannel();
+ channel.shutdownNow();
try {
- Thread.sleep(SHUTDOWN_WAIT_INTERVAL_MILLIS);
+ if (!channel.awaitTermination(SHUTDOWN_WAIT_MAX_SECONDS,
TimeUnit.SECONDS)) {
+ LOG.warn("Channel {} did not terminate within {}s.", channel,
SHUTDOWN_WAIT_MAX_SECONDS);
+ }
} catch (InterruptedException e) {
- LOG.error("Interrupted while waiting for channels to terminate", e);
+ LOG.error("Interrupted while waiting for channel termination", e);
Thread.currentThread().interrupt();
break;
}
}
Review Comment:
its an old behavior that was supposed to be addressed by
[HDDS-14571](https://issues.apache.org/jira/browse/HDDS-14571), I'll file a new
JIRA to get the better fix that does not introduce this regression.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
