diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-10-19 12:27:34 +0100 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-10-19 12:27:34 +0100 |
| commit | 8cbe14bd6d985ceb2f7c098548a3fbeedfce2d55 (patch) | |
| tree | e6eaffe3af3ab5120e3377603b3042594f538054 /keyserver | |
| parent | c1463db6c9183aa67ef41e7ea85ed36dc5817d18 (diff) | |
Fix lock contention
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/internal/internal.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go index d2ea2093..89621aa8 100644 --- a/keyserver/internal/internal.go +++ b/keyserver/internal/internal.go @@ -542,9 +542,7 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer( } // refresh entries from DB: unlike remoteKeysFromDatabase we know we previously had no device info for this // user so the fact that we're populating all devices here isn't a problem so long as we have devices. - respMu.Lock() err = a.populateResponseWithDeviceKeysFromDatabase(ctx, res, respMu, userID, nil) - respMu.Unlock() if err != nil { logrus.WithFields(logrus.Fields{ logrus.ErrorKey: err, @@ -568,6 +566,7 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer( res.Failures[serverName] = map[string]interface{}{ "message": err.Error(), } + respMu.Unlock() // last ditch, use the cache only. This is good for when clients hit /keys/query and the remote server // is down, better to return something than nothing at all. Clients can know about the failure by @@ -578,11 +577,11 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer( } // Sytest expects no failures, if we still could retrieve keys, e.g. from local cache + respMu.Lock() if len(res.DeviceKeys) > 0 { delete(res.Failures, serverName) } respMu.Unlock() - } func (a *KeyInternalAPI) populateResponseWithDeviceKeysFromDatabase( |