fix: remove premature GRPC client connection close from vault (#17321)

hashicorp · Sep 29, 2022 · 7061d12 · 7061d12
1 parent cd90c64
commit 7061d12
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/sdk/plugin/backend.go b/sdk/plugin/backend.go
@@ -59,7 +59,6 @@ func (b *GRPCBackendPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCB
 	ret := &backendGRPCPluginClient{
 		client:        pb.NewBackendClient(c),
 		versionClient: logical.NewPluginVersionClient(c),
-		clientConn:    c,
 		broker:        broker,
 		cleanupCh:     make(chan struct{}),
 		doneCtx:       ctx,

diff --git a/sdk/plugin/grpc_backend_client.go b/sdk/plugin/grpc_backend_client.go
@@ -42,10 +42,7 @@ type backendGRPCPluginClient struct {
 	// server is the grpc server used for serving storage and sysview requests.
 	server *atomic.Value
 
-	// clientConn is the underlying grpc connection to the server, we store it
-	// so it can be cleaned up.
-	clientConn *grpc.ClientConn
-	doneCtx    context.Context
+	doneCtx context.Context
 }
 
 func (b *backendGRPCPluginClient) Initialize(ctx context.Context, _ *logical.InitializationRequest) error {
@@ -194,7 +191,6 @@ func (b *backendGRPCPluginClient) Cleanup(ctx context.Context) {
 	if server != nil {
 		server.(*grpc.Server).GracefulStop()
 	}
-	b.clientConn.Close()
 }
 
 func (b *backendGRPCPluginClient) InvalidateKey(ctx context.Context, key string) {