luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

fix deadlock while loading groups (#3515)

This commit is contained in:
Vishal Nayak 2017-11-01 14:14:21 -04:00 committed by GitHub
parent 7f58c55fbc
commit 859cdd35fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vault/identity_store_util.go
View File

@ -60,6 +60,9 @@ func (i *IdentityStore) loadGroups() error {
}
i.logger.Debug("identity: groups collected", "num_existing", len(existing))
i.groupLock.Lock()
defer i.groupLock.Unlock()
for _, key := range existing {
bucket, err := i.groupPacker.GetBucket(i.groupPacker.BucketPath(key))
if err != nil {
@ -83,14 +86,11 @@ func (i *IdentityStore) loadGroups() error {
i.logger.Trace("loading group", "name", group.Name, "id", group.ID)
}
i.groupLock.Lock()
defer i.groupLock.Unlock()
txn := i.db.Txn(true)
defer txn.Abort()
err = i.upsertGroupInTxn(txn, group, false)
if err != nil {
txn.Abort()
return fmt.Errorf("failed to update group in memdb: %v", err)
}