have all items in bookie status map at outset

Author: hmmr

src/leveled_bookie.erl

@@ -3082,30 +3082,7 @@ maybelog_snap_timing(_Monitor, _, _) ->
 status(#state{monitor = {no_monitor, 0}}) ->
     #{};
 status(#state{monitor = {Monitor, _}}) ->
-    AllZeros =
-        #{
-            ledger_cache_size => undefined,
-            n_active_journal_files => undefined,
-            avg_compaction_score => undefined,
-            level_files_count => undefined,
-            penciller_inmem_cache_size => undefined,
-            penciller_work_backlog_status => undefined,
-            penciller_last_merge_time => undefined,
-            journal_last_compaction_time => undefined,
-            journal_last_compaction_result => undefined,
-            get_sample_count => undefined,
-            get_body_time => undefined,
-            head_sample_count => undefined,
-            head_rsp_time => undefined,
-            put_sample_count => undefined,
-            put_prep_time => undefined,
-            put_ink_time => undefined,
-            put_mem_time => undefined,
-            fetch_count_by_level => undefined
-        },
-    maps:merge(
-        AllZeros, leveled_monitor:get_bookie_status(Monitor)
-    ).
+    leveled_monitor:get_bookie_status(Monitor).
 
 %%%============================================================================
 %%% Test

src/leveled_monitor.erl

@@ -55,6 +55,38 @@
 ]).
 -define(LOG_FREQUENCY_SECONDS, 30).
 
+-define(INITIAL_BOOKIE_STATUS, #{
+    avg_compaction_score => undefined,
+    avg_compaction_score_sample => [],
+    fetch_count_by_level =>
+        #{
+            not_found => #{count => 0, time => 0},
+            mem => #{count => 0, time => 0},
+            lower => #{count => 0, time => 0},
+            '0' => #{count => 0, time => 0},
+            '1' => #{count => 0, time => 0},
+            '2' => #{count => 0, time => 0},
+            '3' => #{count => 0, time => 0}
+        },
+    get_body_time => 0,
+    get_sample_count => 0,
+    head_rsp_time => 0,
+    head_sample_count => 0,
+    journal_last_compaction_result => undefined,
+    journal_last_compaction_time => undefined,
+    ledger_cache_size => undefined,
+    level_files_count => #{},
+    n_active_journal_files => 0,
+    penciller_inmem_cache_size => undefined,
+    penciller_last_merge_time => undefined,
+    penciller_work_backlog_status => undefined,
+    put_ink_time => 0,
+    put_mem_time => 0,
+    put_prep_time => 0,
+    put_sample_count => 0,
+    recent_putgethead_counts => undefined
+}).
+
 -record(bookie_get_timings, {
     sample_count = 0 :: non_neg_integer(),
     head_time = 0 :: non_neg_integer(),
@@ -133,9 +165,10 @@
 
 -type bookie_status() :: #{
     ledger_cache_size => undefined | non_neg_integer(),
-    n_active_journal_files => undefined | pos_integer(),
-    avg_compaction_score_sample => undefined | [float()],
-    level_files_count => undefined | #{non_neg_integer() => non_neg_integer()},
+    n_active_journal_files => non_neg_integer(),
+    avg_compaction_score => undefined | float(),
+    avg_compaction_score_sample => [float()],
+    level_files_count => #{non_neg_integer() => non_neg_integer()},
     penciller_inmem_cache_size => undefined | pos_integer(),
     penciller_work_backlog_status =>
         undefined | {non_neg_integer(), boolean(), boolean()},
@@ -154,7 +187,15 @@
                 count => non_neg_integer(),
                 time => non_neg_integer()
             }
-        }
+        },
+    get_body_time => undefined | non_neg_integer(),
+    get_sample_count => non_neg_integer(),
+    head_rsp_time => undefined | non_neg_integer(),
+    head_sample_count => non_neg_integer(),
+    put_ink_time => undefined | non_neg_integer(),
+    put_mem_time => undefined | non_neg_integer(),
+    put_prep_time => undefined | non_neg_integer(),
+    put_sample_count => non_neg_integer()
 }.
 -type reporting_fetch_level() ::
     not_found | mem | '0' | '1' | '2' | '3' | lower.
@@ -171,7 +212,7 @@
     cdb_get_timings = #cdb_get_timings{} :: cdb_get_timings(),
     log_frequency = ?LOG_FREQUENCY_SECONDS :: pos_integer(),
     log_order = [] :: list(log_type()),
-    bookie_status = #{} :: bookie_status()
+    bookie_status :: bookie_status()
 }).
 
 -type bookie_get_timings() :: #bookie_get_timings{}.
@@ -328,7 +369,7 @@ init([LogOpts, LogFrequency, LogOrder]) ->
     {ok, #state{
         log_frequency = LogFrequency,
         log_order = RandomLogOrder,
-        bookie_status = #{}
+        bookie_status = ?INITIAL_BOOKIE_STATUS
     }}.
 
 handle_call(
@@ -750,21 +791,13 @@ handle_cast({ledger_cache_size_update, A}, State = #state{bookie_status = BS}) -
 handle_cast(
     {n_active_journal_files_update, Delta}, State = #state{bookie_status = BS0}
 ) ->
-    A =
-        case maps:get(n_active_journal_files, BS0, undefined) of
-            undefined -> 0;
-            Defined -> Defined
-        end,
+    A = maps:get(n_active_journal_files, BS0),
     BS = maps:put(n_active_journal_files, A + Delta, BS0),
     {noreply, State#state{bookie_status = BS}};
 handle_cast(
     {avg_compaction_score_update, A}, State = #state{bookie_status = BS}
 ) ->
-    OldSample =
-        case maps:get(avg_compaction_score_sample, BS, undefined) of
-            undefined -> [];
-            Defined -> Defined
-        end,
+    OldSample = maps:get(avg_compaction_score_sample, BS),
     NewSample =
         case [A | OldSample] of
             L when length(L) > ?AVG_COMPACTION_SCORE_OVER_MAX ->
@@ -778,11 +811,7 @@ handle_cast(
 handle_cast(
     {level_files_count_update, U, TS}, State = #state{bookie_status = BS0}
 ) ->
-    A =
-        case maps:get(level_files_count, BS0, undefined) of
-            undefined -> #{};
-            Defined -> Defined
-        end,
+    A = maps:get(level_files_count, BS0, undefined),
     BS1 = maps:put(level_files_count, maps:merge(A, U), BS0),
     BS2 = maps:put(penciller_last_merge_time, TS, BS1),
     {noreply, State#state{bookie_status = BS2}};

test/end_to_end/basic_SUITE.erl

@@ -62,12 +62,13 @@ bookie_status_report(_Config) ->
             {forced_logs, []}
         ],
     {ok, Bookie} = leveled_bookie:book_start(StartOpts),
+    {FF10, FF10} = list_journal_files(RootPath),
 
     InitialReport =
         #{
             ledger_cache_size => undefined,
-            n_active_journal_files => undefined,
-            level_files_count => undefined,
+            n_active_journal_files => 0,
+            level_files_count => #{},
             penciller_inmem_cache_size => undefined,
             penciller_work_backlog_status => undefined,
             penciller_last_merge_time => undefined,
@@ -91,10 +92,19 @@ bookie_status_report(_Config) ->
             put_prep_time => 0,
             put_ink_time => 0,
             put_mem_time => 0,
-            avg_compaction_score => undefined
+            avg_compaction_score => undefined,
+            avg_compaction_score_sample => []
         },
     InitialReport = leveled_bookie:book_status(Bookie),
+    {FF0a, FF0b} = list_journal_files(RootPath),
     io:format(user, "\nInitial report, before any IO\n~p\n", [InitialReport]),
+    io:format(
+        user, "journal files: ~b (reported: ~b), in post_compact: ~b\n", [
+            length(FF0a),
+            maps:get(n_active_journal_files, InitialReport),
+            length(FF0b)
+        ]
+    ),
 
     {TObj, TSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Bookie, TObj, TSpec),
@@ -108,7 +118,7 @@ bookie_status_report(_Config) ->
     within_range(1, GoodPutPrepTime, maps:get(put_prep_time, Rep1)),
     within_range(1, GoodPutInkTime, maps:get(put_ink_time, Rep1)),
     within_range(1, GoodPutMemTime, maps:get(put_mem_time, Rep1)),
-    undefined = maps:get(level_files_count, Rep1),
+    #{} = maps:get(level_files_count, Rep1),
 
     {r_object, TBkt, TKey, _, _, _, _} = TObj,
     {ok, _} = testutil:book_riakget(Bookie, TBkt, TKey),
@@ -117,7 +127,7 @@ bookie_status_report(_Config) ->
     1 = maps:get(get_sample_count, Rep2),
     GoodGetBodyTime = 500,
     within_range(1, GoodGetBodyTime, maps:get(get_body_time, Rep2)),
-    undefined = maps:get(level_files_count, Rep2),
+    #{} = maps:get(level_files_count, Rep2),
 
     io:format("Prompt journal compaction~n"),
     CompactionStarted1 = os:system_time(millisecond),
@@ -132,7 +142,7 @@ bookie_status_report(_Config) ->
         os:system_time(millisecond),
         maps:get(journal_last_compaction_time, Rep3)
     ),
-    undefined = maps:get(level_files_count, Rep3),
+    #{} = maps:get(level_files_count, Rep3),
     undefined = maps:get(penciller_inmem_cache_size, Rep3),
     undefined = maps:get(penciller_last_merge_time, Rep3),
 
@@ -203,14 +213,24 @@ bookie_status_report(_Config) ->
     {FF2a, FF2b} = list_journal_files(RootPath),
     io:format(
         user,
-        "after cleaning up, journal files: ~b (reported: ~b), in post_compact: ~b\n",
-        [
-            length(FF2a), NAJF2, length(FF2b)
-        ]
+        "after cleaning up, journal files: "
+        "~b (reported: ~b), in post_compact: ~b\n",
+        [length(FF2a), NAJF2, length(FF2b)]
     ),
     NAJF2 = length(FF2a),
 
-    ok = leveled_bookie:book_destroy(Bookie).
+    io:format(user, "\nClosing book and reopening\n", []),
+    ok = leveled_bookie:book_close(Bookie),
+    {ok, Bookie2} = leveled_bookie:book_start(StartOpts),
+    Rep7 = leveled_bookie:book_status(Bookie2),
+    {FF3a, _} = list_journal_files(RootPath),
+    io:format(
+        user,
+        "\nAfter reopening store, ~p files reported, ~b found on disk\n",
+        [maps:get(n_active_journal_files, Rep7), length(FF3a)]
+    ),
+
+    ok = leveled_bookie:book_destroy(Bookie2).
 
 within_range(Min, Max, V) ->
     true = Min =< V,