[FOLD] Address mtrippled feedback

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

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp
@@ -427,14 +427,19 @@ 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,13 @@ class DatabaseRotating : public Database
     virtual TaggedCache<uint256, NodeObject> const&
     getPositiveCache() = 0;
 
-    /** Returns the name of the rotated backend.
+    /** Rotates the backends.
+
+        @param f A function executed before the rotation and under the same lock
     */
-    virtual
-    std::string
-    rotateBackends(std::shared_ptr<Backend> newBackend) = 0;
+    virtual 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
@@ -99,11 +102,7 @@ DatabaseRotatingImp::storeLedger(std::shared_ptr<Ledger const> const& srcLedger)
     }();
 
     return Database::storeLedger(
-        *srcLedger,
-        backend,
-        pCache_,
-        nCache_,
-        nullptr);
+        *srcLedger, backend, pCache_, nCache_, nullptr);
 }
 
 void
@@ -168,7 +167,7 @@ DatabaseRotatingImp::fetchFrom(uint256 const& hash, std::uint32_t seq)
 
     // Try to fetch from the writable backend
     auto nObj = fetchInternal(hash, writable);
-    if (! nObj)
+    if (!nObj)
     {
         // Otherwise try to fetch from the archive backend
         nObj = fetchInternal(hash, archive);
@@ -190,7 +189,7 @@ DatabaseRotatingImp::fetchFrom(uint256 const& hash, std::uint32_t seq)
 
 void
 DatabaseRotatingImp::for_each(
-    std::function <void(std::shared_ptr<NodeObject>)> f)
+    std::function<void(std::shared_ptr<NodeObject>)> f)
 {
     auto [writable, archive] = [&] {
         std::lock_guard lock(mutex_);
@@ -204,6 +203,5 @@ DatabaseRotatingImp::for_each(
     archive->for_each(f);
 }
 
-
-} // NodeStore
-} // ripple
+}  // namespace NodeStore
+}  // namespace ripple
diff --git a/src/ripple/nodestore/impl/DatabaseRotatingImp.h b/src/ripple/nodestore/impl/DatabaseRotatingImp.h
@@ -49,8 +49,10 @@ 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;
@@ -125,7 +127,7 @@ class DatabaseRotatingImp : public DatabaseRotating
     fetchFrom(uint256 const& hash, std::uint32_t seq) override;
 
     void
-    for_each(std::function <void(std::shared_ptr<NodeObject>)> f) override;
+    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override;
 };
 
 }  // namespace NodeStore