Unverified Commit 658a8f2a authored by Steven Clark's avatar Steven Clark Committed by GitHub
Browse files

Attempt to address a data race issue within identity store - take 2 (#13476) (#13504)

* Attempt to address a data race issue within identity store
* Testcase TestIdentityStore_LocalAliasInvalidations identified a data race issue.
* This reverts the previous attempt to address the issue from #13093
parent ae611bdf
Showing with 6 additions and 4 deletions
+6 -4
```release-note:bug
core/identity: Address a data race condition between local updates to aliases and invalidations
```
......@@ -750,7 +750,7 @@ func (i *IdentityStore) CreateOrFetchEntity(ctx context.Context, alias *logical.
}
// Check if an entity already exists for the given alias
entity, err = i.entityByAliasFactors(alias.MountAccessor, alias.Name, false)
entity, err = i.entityByAliasFactors(alias.MountAccessor, alias.Name, true)
if err != nil {
return nil, err
}
......@@ -837,8 +837,7 @@ func (i *IdentityStore) CreateOrFetchEntity(ctx context.Context, alias *logical.
}
txn.Commit()
return entity, nil
return entity.Clone()
}
// changedAliasIndex searches an entity for changed alias metadata.
......
......@@ -695,7 +695,7 @@ func (i *IdentityStore) processLocalAlias(ctx context.Context, lAlias *logical.A
return nil, fmt.Errorf("mount accessor %q is not local", lAlias.MountAccessor)
}
alias, err := i.MemDBAliasByFactors(lAlias.MountAccessor, lAlias.Name, true, false)
alias, err := i.MemDBAliasByFactors(lAlias.MountAccessor, lAlias.Name, false, false)
if err != nil {
return nil, err
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment