From d53f2a0882d972778244ff4b71b820343e634024 Mon Sep 17 00:00:00 2001 From: Marc Boudreau Date: Fri, 24 May 2024 14:33:05 -0400 Subject: [PATCH] fix incorrect merge resolution --- vault/identity_store.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vault/identity_store.go b/vault/identity_store.go index b9a4c509cb67..8d53f4c35682 100644 --- a/vault/identity_store.go +++ b/vault/identity_store.go @@ -692,7 +692,7 @@ func (i *IdentityStore) invalidateEntityBucket(ctx context.Context, key string) for _, item := range bucket.Items { bucketEntity, err := i.parseEntityFromBucketItem(ctx, item) if err != nil { - i.logger.Error("failed to fetch entity during local alias invalidation", "entity_id", alias.CanonicalID, "error", err) + i.logger.Error("failed to parse entity from bucket entry item", "error", err) return } @@ -1025,8 +1025,6 @@ func (i *IdentityStore) invalidateLocalAliasesBucket(ctx context.Context, key st } } } - txn.Commit() - return } // Any local aliases still remaining in memDBLocalAliases do not exist in