check client after grabbing lock

hashicorp · Sep 18, 2018 · 3d468da · 3d468da
1 parent cf9e95c
commit 3d468da
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/builtin/logical/aws/backend.go b/builtin/logical/aws/backend.go
@@ -91,6 +91,13 @@ func (b *backend) clientIAM(ctx context.Context, s logical.Storage) (iamiface.IA
 	// Upgrade the lock for writing
 	b.clientMutex.RUnlock()
 	b.clientMutex.Lock()
+	defer b.clientMutex.Unlock()
+
+	// check client again, in the event that a client was being created while we
+	// waited for Lock()
+	if b.iamClient != nil {
+		return b.iamClient, nil
+	}
 
 	iamClient, err := clientIAM(ctx, s)
 	if err != nil {
@@ -111,6 +118,13 @@ func (b *backend) clientSTS(ctx context.Context, s logical.Storage) (stsiface.ST
 	// Upgrade the lock for writing
 	b.clientMutex.RUnlock()
 	b.clientMutex.Lock()
+	defer b.clientMutex.Unlock()
+
+	// check client again, in the event that a client was being created while we
+	// waited for Lock()
+	if b.stsClient != nil {
+		return b.stsClient, nil
+	}
 
 	stsClient, err := clientSTS(ctx, s)
 	if err != nil {