Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/5062#discussion_r153799197
--- Diff:
flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/network/Client.java
---
@@ -166,28 +167,57 @@ public String getClientName() {
* Shuts down the client and closes all connections.
*
* <p>After a call to this method, all returned futures will be failed.
+ *
+ * @return A {@link CompletableFuture} that will be completed when the
shutdown process is done.
*/
- public void shutdown() {
- if (shutDown.compareAndSet(false, true)) {
+ public CompletableFuture<Void> shutdown() {
+ final CompletableFuture<Void> newShutdownFuture = new
CompletableFuture<>();
+ if (clientShutdownFuture.compareAndSet(null,
newShutdownFuture)) {
+
+ final List<CompletableFuture<Void>> connectionFutures =
new ArrayList<>();
+
for (Map.Entry<InetSocketAddress,
EstablishedConnection> conn : establishedConnections.entrySet()) {
if
(establishedConnections.remove(conn.getKey(), conn.getValue())) {
- conn.getValue().close();
+
connectionFutures.add(conn.getValue().close());
}
}
for (Map.Entry<InetSocketAddress, PendingConnection>
conn : pendingConnections.entrySet()) {
if (pendingConnections.remove(conn.getKey()) !=
null) {
- conn.getValue().close();
+
connectionFutures.add(conn.getValue().close());
}
}
- if (bootstrap != null) {
- EventLoopGroup group = bootstrap.group();
- if (group != null) {
- group.shutdownGracefully(0L, 10L,
TimeUnit.SECONDS);
+ CompletableFuture.allOf(
+ connectionFutures.toArray(new
CompletableFuture<?>[connectionFutures.size()])
+ ).whenComplete((result, throwable) -> {
+ if (throwable != null) {
+
newShutdownFuture.completeExceptionally(throwable);
+ } else if (bootstrap != null) {
--- End diff --
this means that the bootstrap is not shutdown if a connection cannot be
closed for whatever reason, which is rather odd. We should still at least try
to shut it down.
---
