grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: mark Sds-Ssl threadfactory daemon to allow apps to exit (#6608)

This commit is contained in:
sanjaypujare 2020-01-15 11:10:19 -08:00 committed by GitHub
parent cf89b4b53d
commit 1b5d61f18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xds/src/main/java/io/grpc/xds/sds/ClientSslContextProviderFactory.java
View File

@ -19,6 +19,7 @@ package io.grpc.xds.sds;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.envoyproxy.envoy.api.v2.auth.UpstreamTlsContext; import io.envoyproxy.envoy.api.v2.auth.UpstreamTlsContext;
import io.grpc.xds.Bootstrapper; import io.grpc.xds.Bootstrapper;
import io.grpc.xds.sds.ReferenceCountingSslContextProviderMap.SslContextProviderFactory; import io.grpc.xds.sds.ReferenceCountingSslContextProviderMap.SslContextProviderFactory;
@ -45,7 +46,10 @@ final class ClientSslContextProviderFactory
return SdsSslContextProvider.getProviderForClient( return SdsSslContextProvider.getProviderForClient(
upstreamTlsContext, upstreamTlsContext,
Bootstrapper.getInstance().readBootstrap().getNode(), Bootstrapper.getInstance().readBootstrap().getNode(),
Executors.newSingleThreadExecutor(), Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
.setNameFormat("client-sds-sslcontext-provider-%d")
.setDaemon(true)
.build()),
/* channelExecutor= */ null); /* channelExecutor= */ null);
} catch (IOException ioe) { } catch (IOException ioe) {
throw new RuntimeException(ioe); throw new RuntimeException(ioe);

6
xds/src/main/java/io/grpc/xds/sds/ServerSslContextProviderFactory.java
View File

@ -19,6 +19,7 @@ package io.grpc.xds.sds;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.envoyproxy.envoy.api.v2.auth.DownstreamTlsContext; import io.envoyproxy.envoy.api.v2.auth.DownstreamTlsContext;
import io.grpc.xds.Bootstrapper; import io.grpc.xds.Bootstrapper;
import io.grpc.xds.sds.ReferenceCountingSslContextProviderMap.SslContextProviderFactory; import io.grpc.xds.sds.ReferenceCountingSslContextProviderMap.SslContextProviderFactory;
@ -46,7 +47,10 @@ final class ServerSslContextProviderFactory
return SdsSslContextProvider.getProviderForServer( return SdsSslContextProvider.getProviderForServer(
downstreamTlsContext, downstreamTlsContext,
Bootstrapper.getInstance().readBootstrap().getNode(), Bootstrapper.getInstance().readBootstrap().getNode(),
Executors.newSingleThreadExecutor(), Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
.setNameFormat("server-sds-sslcontext-provider-%d")
.setDaemon(true)
.build()),
/* channelExecutor= */ null); /* channelExecutor= */ null);
} catch (IOException ioe) { } catch (IOException ioe) {
throw new RuntimeException(ioe); throw new RuntimeException(ioe);