Improve online_delete configuration and DB tuning:

cfg/rippled-example.cfg

@@ -993,6 +993,9 @@
 #                           These settings trade speed and reduced I/O
 #                           for a higher risk of data loss. See the
 #                           individual settings below for more information.
+#                           This setting may not be combined with any of the
+#                           other tuning settings: "journal_mode",
+#                           "synchronous", or "temp_store".
 #
 #       journal_mode        Valid values: delete, truncate, persist, memory, wal, off
 #                           The default is "wal", which uses a write-ahead
@@ -1002,6 +1005,8 @@
 #                           database is likely to be corrupted.
 #                           See https://www.sqlite.org/pragma.html#pragma_journal_mode
 #                           for more details about the available options.
+#                           This setting may not be combined with the
+#                           "safety_level" setting.
 #
 #       synchronous         Valid values: off, normal, full, extra
 #                           The default is "normal", which works well with
@@ -1013,6 +1018,8 @@
 #                           data to disk.
 #                           See https://www.sqlite.org/pragma.html#pragma_synchronous
 #                           for more details about the available options.
+#                           This setting may not be combined with the
+#                           "safety_level" setting.
 #
 #       temp_store          Valid values: default, file, memory
 #                           The default is "file", which will use files
@@ -1022,6 +1029,8 @@
 #                           of these temporary objects.
 #                           See https://www.sqlite.org/pragma.html#pragma_temp_store
 #                           for more details about the available options.
+#                           This setting may not be combined with the
+#                           "safety_level" setting.
 #
 #
 #

src/ripple/app/main/Application.cpp

@@ -1364,7 +1364,7 @@ class ApplicationImp : public Application, public RootStoppable, public BasicApp
                 JLOG(m_journal.fatal())
                     << "Free SQLite space for transaction db is less than "
                        "512MB. To fix this, rippled must be executed with the "
-                       "vacuum <sqlitetmpdir> parameter before restarting. "
+                       "\"--vacuum\" parameter before restarting. "
                        "Note that this activity can take multiple days, "
                        "depending on database size.";
                 signalStop();

src/ripple/app/main/Main.cpp

@@ -354,10 +354,7 @@ run(int argc, char** argv)
         "nodetoshard", "Import node store into shards")(
         "replay", "Replay a ledger close.")(
         "start", "Start from a fresh Ledger.")(
-        "vacuum",
-        po::value<std::string>(),
-        "VACUUM the transaction db. Mandatory string argument specifies "
-        "temporary directory path.")(
+        "vacuum", "VACUUM the transaction db.")(
         "valid", "Consider the initial ledger a valid network ledger.")(
         "validateShards", shardsText.c_str());
 
@@ -522,26 +519,26 @@ run(int argc, char** argv)
         using namespace boost::filesystem;
         DatabaseCon::Setup dbSetup = setup_DatabaseCon(*config);
         path dbPath = dbSetup.dataDir / TxDBName;
-        path tmpPath = vm["vacuum"].as<std::string>();
 
         try
         {
             uintmax_t const dbSize = file_size(dbPath);
             assert(dbSize != static_cast<uintmax_t>(-1));
 
-            if (space(tmpPath).available < dbSize)
             {
-                std::cerr << "A valid directory for vacuuming must be "
-                             "specified on a filesystem with at least "
-                             "as much free space as the size of "
-                          << dbPath.string() << ", which is " << dbSize
-                          << " bytes. The filesystem for " << tmpPath.string()
-                          << " only has " << space(tmpPath).available
-                          << " bytes.\n";
-                return -1;
+                auto available = space(dbPath.parent_path()).available;
+                if (available < dbSize)
+                {
+                    std::cerr
+                        << "The database filesystem must have at least as "
+                           "much free space as the size of "
+                        << dbPath.string() << ", which is " << dbSize
+                        << " bytes. Only " << available
+                        << " bytes are available.\n";
+                    return -1;
+                }
             }
 
-            dbSetup.noPragma();
             auto txnDB = std::make_unique<DatabaseCon>(
                 dbSetup, TxDBName, TxDBPragma, TxDBInit);
             auto& session = txnDB->getSession();
@@ -552,9 +549,6 @@ run(int argc, char** argv)
             std::cout << "VACUUM beginning. page_size: " << pageSize
                       << std::endl;
 
-            session << "PRAGMA journal_mode=OFF;";
-            session << "PRAGMA temp_store_directory=\"" << tmpPath.string()
-                    << "\";";
             session << "VACUUM;";
             assert(dbSetup.globalPragma);
             for (auto const& p : *dbSetup.globalPragma)

src/ripple/core/impl/DatabaseCon.cpp

@@ -48,21 +48,21 @@ setup_DatabaseCon(Config const& c, boost::optional<beast::Journal> j)
             result->reserve(3);
 
             // defaults
-            std::string safety_level = "high";
+            std::string safety_level;
             std::string journal_mode = "wal";
             std::string synchronous = "normal";
             std::string temp_store = "file";
+            bool showRiskWarning = false;
 
-            bool showWarning = false;
             if (set(safety_level, "safety_level", sqlite))
             {
-                if (boost::iequals(safety_level, "low"))
+                showRiskWarning = boost::iequals(safety_level, "low");
+                if (showRiskWarning)
                 {
                     // low safety defaults
                     journal_mode = "memory";
                     synchronous = "off";
                     temp_store = "memory";
-                    showWarning = true;
                 }
                 else if (!boost::iequals(safety_level, "high"))
                 {
@@ -74,11 +74,16 @@ setup_DatabaseCon(Config const& c, boost::optional<beast::Journal> j)
             {
                 // #journal_mode Valid values : delete, truncate, persist,
                 // memory, wal, off
-                if (c.LEDGER_HISTORY < SQLITE_TUNING_CUTOFF)
-                    set(journal_mode, "journal_mode", sqlite);
+                if (set(journal_mode, "journal_mode", sqlite) &&
+                    !safety_level.empty())
+                {
+                    Throw<std::runtime_error>(
+                        "Configuration file may not define both "
+                        "\"safety_level\" and \"journal_mode\"");
+                }
                 bool higherRisk = boost::iequals(journal_mode, "memory") ||
                     boost::iequals(journal_mode, "off");
-                showWarning = showWarning || higherRisk;
+                showRiskWarning = showRiskWarning || higherRisk;
                 if (higherRisk || boost::iequals(journal_mode, "delete") ||
                     boost::iequals(journal_mode, "truncate") ||
                     boost::iequals(journal_mode, "persist") ||
@@ -96,10 +101,15 @@ setup_DatabaseCon(Config const& c, boost::optional<beast::Journal> j)
 
             {
                 //#synchronous Valid values : off, normal, full, extra
-                if (c.LEDGER_HISTORY < SQLITE_TUNING_CUTOFF)
-                    set(synchronous, "synchronous", sqlite);
+                if (set(synchronous, "synchronous", sqlite) &&
+                    !safety_level.empty())
+                {
+                    Throw<std::runtime_error>(
+                        "Configuration file may not define both "
+                        "\"safety_level\" and \"synchronous\"");
+                }
                 bool higherRisk = boost::iequals(synchronous, "off");
-                showWarning = showWarning || higherRisk;
+                showRiskWarning = showRiskWarning || higherRisk;
                 if (higherRisk || boost::iequals(synchronous, "normal") ||
                     boost::iequals(synchronous, "full") ||
                     boost::iequals(synchronous, "extra"))
@@ -116,10 +126,15 @@ setup_DatabaseCon(Config const& c, boost::optional<beast::Journal> j)
 
             {
                 // #temp_store Valid values : default, file, memory
-                if (c.LEDGER_HISTORY < SQLITE_TUNING_CUTOFF)
-                    set(temp_store, "temp_store", sqlite);
+                if (set(temp_store, "temp_store", sqlite) &&
+                    !safety_level.empty())
+                {
+                    Throw<std::runtime_error>(
+                        "Configuration file may not define both "
+                        "\"safety_level\" and \"temp_store\"");
+                }
                 bool higherRisk = boost::iequals(temp_store, "memory");
-                showWarning = showWarning || higherRisk;
+                showRiskWarning = showRiskWarning || higherRisk;
                 if (higherRisk || boost::iequals(temp_store, "default") ||
                     boost::iequals(temp_store, "file"))
                 {
@@ -133,7 +148,7 @@ setup_DatabaseCon(Config const& c, boost::optional<beast::Journal> j)
                 }
             }
 
-            if (showWarning && j && c.LEDGER_HISTORY > SQLITE_TUNING_CUTOFF)
+            if (showRiskWarning && j && c.LEDGER_HISTORY > SQLITE_TUNING_CUTOFF)
             {
                 JLOG(j->warn())
                     << "reducing the data integrity guarantees from the "

src/test/jtx/Env.h

@@ -168,11 +168,7 @@ class Env
         std::unique_ptr<Logs> logs = nullptr,
         beast::severities::Severity thresh = beast::severities::kError)
         : test(suite_)
-        , bundle_(
-              suite_,
-              std::move(config),
-              logs ? std::move(logs) : std::make_unique<SuiteLogs>(suite_),
-              thresh)
+        , bundle_(suite_, std::move(config), std::move(logs), thresh)
         , journal{bundle_.app->journal("Env")}
     {
         memoize(Account::master);

src/test/jtx/impl/Env.cpp

@@ -64,8 +64,17 @@ Env::AppBundle::AppBundle(
     : AppBundle()
 {
     using namespace beast::severities;
-    // Use kFatal threshold to reduce noise from STObject.
-    setDebugLogSink(std::make_unique<SuiteJournalSink>("Debug", kFatal, suite));
+    if (logs)
+    {
+        setDebugLogSink(logs->makeSink("Debug", kFatal));
+    }
+    else
+    {
+        logs = std::make_unique<SuiteLogs>(suite);
+        // Use kFatal threshold to reduce noise from STObject.
+        setDebugLogSink(
+            std::make_unique<SuiteJournalSink>("Debug", kFatal, suite));
+    }
     auto timeKeeper_ = std::make_unique<ManualTimeKeeper>();
     timeKeeper = timeKeeper_.get();
     // Hack so we don't have to call Config::setup