Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit f66cc12

Browse files
ajaaymandreamlin
authored andcommitted
Shutdown GRPC managed channel properly on close (#628)
Fix #3912, 3693 & 3648 Shutdown GRPC Managed channel properly on closing of background resources.
1 parent 39fc686 commit f66cc12

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcTransportChannel.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
package com.google.api.gax.grpc;
3131

3232
import com.google.api.core.InternalExtensionOnly;
33+
import com.google.api.gax.core.ResourceCloseException;
3334
import com.google.api.gax.rpc.TransportChannel;
3435
import com.google.auto.value.AutoValue;
3536
import io.grpc.Channel;
@@ -91,6 +92,11 @@ public boolean awaitTermination(long duration, TimeUnit unit) throws Interrupted
9192
@Override
9293
public void close() {
9394
getManagedChannel().shutdown();
95+
try {
96+
awaitTermination(6, TimeUnit.MINUTES);
97+
} catch (InterruptedException e) {
98+
throw new ResourceCloseException(e);
99+
}
94100
}
95101

96102
public static Builder newBuilder() {
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright 2019 Google LLC
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions are
6+
* met:
7+
*
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above
11+
* copyright notice, this list of conditions and the following disclaimer
12+
* in the documentation and/or other materials provided with the
13+
* distribution.
14+
* * Neither the name of Google LLC nor the names of its
15+
* contributors may be used to endorse or promote products derived from
16+
* this software without specific prior written permission.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
package com.google.api.gax.core;
31+
32+
/** An exception occurs when some background resource is not able to close properly. */
33+
public class ResourceCloseException extends RuntimeException {
34+
35+
private static final long serialVersionUID = -283748743873637484L;
36+
37+
public ResourceCloseException(Exception exception) {
38+
super(exception);
39+
}
40+
}

0 commit comments

Comments
 (0)