Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: resolve database deadlock: #4989

Merged
merged 4 commits into from
Apr 18, 2024
Merged

fix: resolve database deadlock: #4989

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76ee8d6
fix: resolve database deadlock:
seelabs Apr 12, 2024
d7ff96d
Merge branch 'develop' into db-deadlock
ximinez Apr 18, 2024
3f908fa
Merge branch 'develop' into db-deadlock
ximinez Apr 18, 2024
e6e26d4
Merge branch 'develop' into db-deadlock
ximinez Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/ripple/nodestore/impl/DatabaseRotatingImp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

#include <ripple/nodestore/DatabaseRotating.h>

#include <mutex>

namespace ripple {
namespace NodeStore {

Expand Down Expand Up @@ -82,7 +84,13 @@ class DatabaseRotatingImp : public DatabaseRotating
private:
std::shared_ptr<Backend> writableBackend_;
std::shared_ptr<Backend> archiveBackend_;
mutable std::mutex mutex_;
// This needs to be a recursive mutex because callbacks in `rotateWithLock`
// can call function that also lock the mutex. A current example of this is
// a callback from SHAMapStoreImp, which calls `clearCaches`. This
// `clearCaches` call eventually calls `fetchNodeObject` which tries to
// relock the mutex. It would be desirable to rewrite the code so the lock
// was not held during a callback.
mutable std::recursive_mutex mutex_;

std::shared_ptr<NodeObject>
fetchNodeObject(
Expand Down
Loading