From bb6ec1470d24e4dc8dd0d7b640bb2fd7167fcff6 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Wed, 17 May 2023 11:50:25 +0200 Subject: [PATCH] Plugins: Correct the usage of mutex for gRPC plugin implementation (#68555) correct usage of mutex --- pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go b/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go index ee8dadf372e..120d65758b4 100644 --- a/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go +++ b/pkg/plugins/backendplugin/grpcplugin/grpc_plugin.go @@ -52,7 +52,7 @@ func (p *grpcPlugin) Logger() log.Logger { return p.logger } -func (p *grpcPlugin) Start(ctx context.Context) error { +func (p *grpcPlugin) Start(_ context.Context) error { p.mutex.Lock() defer p.mutex.Unlock() @@ -85,7 +85,7 @@ func (p *grpcPlugin) Start(ctx context.Context) error { return nil } -func (p *grpcPlugin) Stop(ctx context.Context) error { +func (p *grpcPlugin) Stop(_ context.Context) error { p.mutex.Lock() defer p.mutex.Unlock() @@ -109,8 +109,8 @@ func (p *grpcPlugin) Exited() bool { } func (p *grpcPlugin) Decommission() error { - p.mutex.RLock() - defer p.mutex.RUnlock() + p.mutex.Lock() + defer p.mutex.Unlock() p.decommissioned = true @@ -118,6 +118,8 @@ func (p *grpcPlugin) Decommission() error { } func (p *grpcPlugin) IsDecommissioned() bool { + p.mutex.RLock() + defer p.mutex.RUnlock() return p.decommissioned }