[FOLD] Defer setting Stoppable parent

src/ripple/core/Stoppable.h

@@ -209,6 +209,11 @@ class Stoppable
     /** Destroy the Stoppable. */
     virtual ~Stoppable ();
 
+    RootStoppable& getRoot() {return m_root;}
+
+    /** Add this Stoppable to a parent. */
+    void addToParent(Stoppable& parent);
+
     /** Returns `true` if the stoppable should stop. */
     bool isStopping () const;
 

src/ripple/core/impl/Stoppable.cpp

@@ -34,16 +34,21 @@ Stoppable::Stoppable (std::string name, Stoppable& parent)
     , m_root (parent.m_root)
     , m_child (this)
 {
-    // Must not have stopping parent.
-    assert (! parent.isStopping());
-
-    parent.m_children.push_front (&m_child);
+    addToParent(parent);
 }
 
 Stoppable::~Stoppable ()
 {
 }
 
+void Stoppable::addToParent (Stoppable& parent)
+{
+    // Must not have stopping parent.
+    assert (! parent.isStopping());
+
+    parent.m_children.push_front(&m_child);
+}
+
 bool Stoppable::isStopping() const
 {
     return m_root.isStopping();

src/ripple/nodestore/impl/Database.cpp

@@ -33,7 +33,7 @@ Database::Database(
     int readThreads,
     Section const& config,
     beast::Journal journal)
-    : Stoppable(name, parent)
+    : Stoppable(name, parent.getRoot())
     , j_(journal)
     , scheduler_(scheduler)
     , earliestSeq_(get<std::uint32_t>(

src/ripple/nodestore/impl/DatabaseNodeImp.h

@@ -49,6 +49,7 @@ class DatabaseNodeImp : public Database
         , backend_(std::move(backend))
     {
         assert(backend_);
+        addToParent(parent);
     }
 
     ~DatabaseNodeImp() override

src/ripple/nodestore/impl/DatabaseRotatingImp.cpp

@@ -45,6 +45,7 @@ DatabaseRotatingImp::DatabaseRotatingImp(
         fdLimit_ += writableBackend_->fdlimit();
     if (archiveBackend_)
         fdLimit_ += archiveBackend_->fdlimit();
+    addToParent(parent);
 }
 
 // Make sure to call it already locked!

src/ripple/nodestore/impl/DatabaseShardImp.cpp

@@ -1276,8 +1276,10 @@ make_ShardStore(
         scheduler,
         readThreads,
         j);
-    if (!shardStore->init())
-        Throw<std::runtime_error>("shard store failed to initialize.");
+    if (shardStore->init())
+        shardStore->addToParent(parent);
+    else
+        shardStore.reset();
 
     return shardStore;
 }