diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-02 11:31:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 11:31:16 +0200 |
| commit | e659ee2c17755b7985d2b64bb9b3da01da976174 (patch) | |
| tree | 26da74847c97722ddc37c0dd61d66e39d3dcdf77 | |
| parent | f5f4606cc41ace593279d1548657c72a4af45ad7 (diff) | |
| parent | 6d906737aee7f156dea8d9540ac5b94b76c3b75c (diff) | |
Merge pull request #18085 from vespa-engine/arnej/avoid-deadlock-in-signal-handler
avoid deadlock on signal lock
| -rw-r--r-- | storageserver/src/apps/storaged/storage.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp index 8098ee138db..6fd672574c6 100644 --- a/storageserver/src/apps/storaged/storage.cpp +++ b/storageserver/src/apps/storaged/storage.cpp @@ -65,9 +65,7 @@ public: ~StorageApp() override; void handleSignal(int signal) { - LOG(info, "Got signal %d, waiting for lock", signal); - std::lock_guard sync(_signalLock); - LOG(info, "Got lock for signal %d", signal); + LOG(info, "Got signal %d", signal); _lastSignal = signal; _signalCond.notify_one(); } |