From 1954a0eb2ea612ce4bb6f1fa5f0b020729dec111 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 22 Nov 2013 15:57:41 -0800 Subject: [PATCH 1/4] Set version to 0.18.0 --- src/ripple_data/protocol/BuildInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ripple_data/protocol/BuildInfo.cpp b/src/ripple_data/protocol/BuildInfo.cpp index d64ff11d6..83b34461e 100644 --- a/src/ripple_data/protocol/BuildInfo.cpp +++ b/src/ripple_data/protocol/BuildInfo.cpp @@ -25,7 +25,7 @@ char const* BuildInfo::getRawVersionString () // // The build version number (edit this for each release) // - "0.17.0-rc5" + "0.18.0" // // Must follow the format described here: // From b632a6b2cfc5569de748c347958d363433658e98 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 22 Nov 2013 16:13:12 -0800 Subject: [PATCH 2/4] If the RocksDB base file size is changed, change the write cache and L0 size to match --- src/ripple_core/nodestore/backend/RocksDBFactory.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ripple_core/nodestore/backend/RocksDBFactory.cpp b/src/ripple_core/nodestore/backend/RocksDBFactory.cpp index f8670b626..1a86803bd 100644 --- a/src/ripple_core/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple_core/nodestore/backend/RocksDBFactory.cpp @@ -125,6 +125,8 @@ public: if (! keyValues["file_size_mb"].isEmpty()) { options.target_file_size_base = 1024 * 1024 * keyValues["file_size_mb"].getIntValue(); + options.max_bytes_for_level_base = 5 * options.target_file_size_base; + options.write_buffer_size = 2 * options.target_file_size_base; } if (! keyValues["file_size_mult"].isEmpty()) From 54e504dd5a76b1741e9f90433bc57ea994de3fff Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 22 Nov 2013 16:42:25 -0800 Subject: [PATCH 3/4] Make --import work --- src/ripple_app/main/Application.cpp | 2 +- src/ripple_app/main/RippleMain.cpp | 4 +--- src/ripple_core/functional/Config.cpp | 1 + src/ripple_core/functional/Config.h | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ripple_app/main/Application.cpp b/src/ripple_app/main/Application.cpp index 974d3cf2c..6b27f5047 100644 --- a/src/ripple_app/main/Application.cpp +++ b/src/ripple_app/main/Application.cpp @@ -1225,7 +1225,7 @@ void ApplicationImp::updateTables () exit (1); } - if (getConfig ().importNodeDatabase.size () > 0) + if (getConfig ().doImport) { NodeStore::DummyScheduler scheduler; ScopedPointer source (NodeStore::Database::New ( diff --git a/src/ripple_app/main/RippleMain.cpp b/src/ripple_app/main/RippleMain.cpp index 66ed1b19b..cff95bf78 100644 --- a/src/ripple_app/main/RippleMain.cpp +++ b/src/ripple_app/main/RippleMain.cpp @@ -407,9 +407,7 @@ int RippleMain::run (int argc, char const* const* argv) // if (vm.count ("import")) { - String const optionString (vm ["import"].as ()); - - getConfig ().importNodeDatabase = parseDelimitedKeyValueString (optionString); + getConfig ().doImport = true; } if (vm.count ("ledger")) diff --git a/src/ripple_core/functional/Config.cpp b/src/ripple_core/functional/Config.cpp index 94576f153..d04e24a12 100644 --- a/src/ripple_core/functional/Config.cpp +++ b/src/ripple_core/functional/Config.cpp @@ -108,6 +108,7 @@ Config::Config () ELB_SUPPORT = false; RUN_STANDALONE = false; + doImport = false; START_UP = NORMAL; } diff --git a/src/ripple_core/functional/Config.h b/src/ripple_core/functional/Config.h index 7c303e6c3..4d581a239 100644 --- a/src/ripple_core/functional/Config.h +++ b/src/ripple_core/functional/Config.h @@ -325,6 +325,7 @@ public: '='['|''='value] @see parseDelimitedKeyValueString */ + bool doImport; StringPairArray importNodeDatabase; // From 26783607157a8b96e6e754f71565f4eb0134efc1 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 22 Nov 2013 23:36:50 -0800 Subject: [PATCH 4/4] Set version to 0.19.0 --- src/ripple_data/protocol/BuildInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ripple_data/protocol/BuildInfo.cpp b/src/ripple_data/protocol/BuildInfo.cpp index 83b34461e..a848db2e2 100644 --- a/src/ripple_data/protocol/BuildInfo.cpp +++ b/src/ripple_data/protocol/BuildInfo.cpp @@ -25,7 +25,7 @@ char const* BuildInfo::getRawVersionString () // // The build version number (edit this for each release) // - "0.18.0" + "0.19.0" // // Must follow the format described here: //