diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index 2204128..b388cae 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -162,7 +162,6 @@ -define(SHUTDOWN_WAITS, 60). -define(SHUTDOWN_PAUSE, 10000). -define(SNAPSHOT_TIMEOUT, 300000). --define(JITTER_PROB, 0.01). -define(CHECKJOURNAL_PROB, 0.2). -record(state, {inker :: pid(), @@ -780,13 +779,15 @@ maybepush_ledgercache(MaxCacheSize, Cache, Penciller) -> maybe_withjitter(CacheSize, MaxCacheSize) -> + if CacheSize > 2 * MaxCacheSize -> true; CacheSize > MaxCacheSize -> - R = random:uniform(), + T = 2 * MaxCacheSize - CacheSize, + R = random:uniform(CacheSize), if - R < ?JITTER_PROB -> + R > T -> true; true -> false @@ -795,6 +796,8 @@ maybe_withjitter(CacheSize, MaxCacheSize) -> false end. + + load_fun(KeyInLedger, ValueInLedger, _Position, Acc0, ExtractFun) -> {MinSQN, MaxSQN, OutputTree} = Acc0, {SQN, Type, PK} = KeyInLedger, diff --git a/test/end_to_end/iterator_SUITE.erl b/test/end_to_end/iterator_SUITE.erl index 1353aa8..7e1fcff 100644 --- a/test/end_to_end/iterator_SUITE.erl +++ b/test/end_to_end/iterator_SUITE.erl @@ -7,12 +7,12 @@ -export([all/0]). -export([simple_load_with2i/1, - simple_querycount/1, + query_count/1, rotating_objects/1]). all() -> [ simple_load_with2i, - simple_querycount, + query_count, rotating_objects]. @@ -41,9 +41,9 @@ simple_load_with2i(_Config) -> testutil:reset_filestructure(). -simple_querycount(_Config) -> +query_count(_Config) -> RootPath = testutil:reset_filestructure(), - {ok, Book1} = leveled_bookie:book_start(RootPath, 2500, 50000000), + {ok, Book1} = leveled_bookie:book_start(RootPath, 2000, 50000000), {TestObject, TestSpec} = testutil:generate_testobject("Bucket", "Key1", "Value1",