[FOLD] Address mtrippled feedback

XRPLF · Apr 30, 2020 · f66e258 · f66e258
1 parent c2291a6
commit f66e258
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp
@@ -427,14 +427,20 @@ SHAMapStoreImp::run()
  }
 
  lastRotated_ = validatedSeq;
- clearCaches(validatedSeq);
 
- SavedState savedState;
- savedState.writableDb = newBackend->getName();
- savedState.archiveDb = dbRotating_->rotateBackends(
- std::move(newBackend));
- savedState.lastRotated = lastRotated_;
- state_db_.setState(savedState);
+ dbRotating_->rotateWithLock(
+ [&](std::string const& writableBackendName)
+ {
+ SavedState savedState;
+ savedState.writableDb = newBackend->getName();
+ savedState.archiveDb = writableBackendName;
+ savedState.lastRotated = lastRotated_;
+ state_db_.setState(savedState);
+
+ clearCaches(validatedSeq);
+
+ return std::move(newBackend);
+ });
 
  JLOG(journal_.warn()) << "finished rotation " << validatedSeq;
  }

diff --git a/src/ripple/nodestore/DatabaseRotating.h b/src/ripple/nodestore/DatabaseRotating.h
@@ -47,11 +47,11 @@ class DatabaseRotating : public Database
  virtual TaggedCache<uint256, NodeObject> const&
  getPositiveCache() = 0;
 
- /** Returns the name of the rotated backend.
- */
  virtual
- std::string
- rotateBackends(std::shared_ptr<Backend> newBackend) = 0;
+ void
+ rotateWithLock(
+ std::function<std::unique_ptr<NodeStore::Backend>(
+ std::string const& writableBackendName)> const& f) = 0;
 };
 
 } // namespace NodeStore

diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp b/src/ripple/nodestore/impl/DatabaseRotatingImp.cpp
@@ -55,14 +55,17 @@ DatabaseRotatingImp::DatabaseRotatingImp(
  setParent(parent);
 }
 
-std::string
-DatabaseRotatingImp::rotateBackends(std::shared_ptr<Backend> newBackend)
+void
+DatabaseRotatingImp::rotateWithLock(
+ std::function<std::unique_ptr<NodeStore::Backend>(
+ std::string const& writableBackendName)> const& f)
 {
  std::lock_guard lock(mutex_);
+
+ auto newBackend = f(writableBackend_->getName());
  archiveBackend_->setDeletePath();
  archiveBackend_ = std::move(writableBackend_);
  writableBackend_ = std::move(newBackend);
- return archiveBackend_->getName();
 }
 
 std::string

diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.h b/src/ripple/nodestore/impl/DatabaseRotatingImp.h
@@ -49,8 +49,9 @@ class DatabaseRotatingImp : public DatabaseRotating
  stopThreads();
  }
 
- std::string
- rotateBackends(std::shared_ptr<Backend> newBackend) override;
+ void
+ rotateWithLock(std::function<std::unique_ptr<NodeStore::Backend>(
+ std::string const& writableBackendName)> const& f) override;
 
  std::string
  getName() const override;