From cf315e0e42755973bc96d1bdd8c929917a82392d Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 21 Oct 2016 12:04:47 -0700 Subject: [PATCH 1/2] Remove IBD flush lock setting. --- data/bs.cfg | 2 -- src/parser.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/data/bs.cfg b/data/bs.cfg index 56cbf11c..532c1974 100644 --- a/data/bs.cfg +++ b/data/bs.cfg @@ -121,8 +121,6 @@ checkpoint = 000000000000000004ec466ce4732fe6f1ed1cddc2ed4b328fff5224276e3f6f:40 block_timeout_seconds = 5 # The maximum number of connections for initial block download, defaults to 8. initial_connections = 8 -# Flush to disk after this number of blocks during initial block download, defaults to 0 (disabled). -initial_flush_size = 0 # Refresh the transaction pool on reorganization and channel start, defaults to true. transaction_pool_refresh = true diff --git a/src/parser.cpp b/src/parser.cpp index 5ccfdf0a..a9450ce4 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -325,11 +325,6 @@ options_metadata parser::load_settings() value(&configured.node.initial_connections), "The maximum number of connections for initial block download, defaults to 8." ) - ( - "node.initial_flush_size", - value(&configured.node.initial_flush_size), - "Flush to disk after this number of blocks during initial block download, defaults to 0 (disabled)." - ) ( "node.transaction_pool_refresh", value(&configured.node.transaction_pool_refresh), From 353b3a1aafceacc86fe906edcb0a2e4ac75852e9 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 21 Oct 2016 16:58:24 -0700 Subject: [PATCH 2/2] Adapt to bc prng changes. --- src/services/heartbeat_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/heartbeat_service.cpp b/src/services/heartbeat_service.cpp index 25db0350..4e797f7a 100644 --- a/src/services/heartbeat_service.cpp +++ b/src/services/heartbeat_service.cpp @@ -64,7 +64,7 @@ void heartbeat_service::work() poller.add(publisher); // Pick a random counter start, will wrap around at overflow. - auto count = static_cast(pseudo_random()); + auto count = static_cast(pseudo_random(0, max_uint32)); // We will not receive on the poller, we use its timer and context stop. while (!poller.terminated() && !stopped())