From 486af59da11d815026a0203827dc4028ac1503f1 Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Sat, 11 May 2019 13:26:07 +0100 Subject: [PATCH] Soften log noise --- src/leveled_bookie.erl | 4 ++-- src/leveled_inker.erl | 10 +++++++--- src/leveled_log.erl | 8 ++++---- src/leveled_penciller.erl | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/leveled_bookie.erl b/src/leveled_bookie.erl index fde087d..f77a792 100644 --- a/src/leveled_bookie.erl +++ b/src/leveled_bookie.erl @@ -109,8 +109,8 @@ -define(CACHE_SIZE_JITTER, 25). -define(JOURNAL_SIZE_JITTER, 20). -define(ABSOLUTEMAX_JOURNALSIZE, 4000000000). --define(LONG_RUNNING, 200000). - % An individual task taking > 200ms gets a specific log +-define(LONG_RUNNING, 1000000). + % An individual task taking > 1s gets a specific log -define(COMPRESSION_METHOD, lz4). -define(COMPRESSION_POINT, on_receipt). -define(LOG_LEVEL, info). diff --git a/src/leveled_inker.erl b/src/leveled_inker.erl index a66e43e..e19ceda 100644 --- a/src/leveled_inker.erl +++ b/src/leveled_inker.erl @@ -733,10 +733,14 @@ handle_cast({clerk_complete, ManifestSnippet, FilesToDelete}, State) -> pending_removals=FilesToDelete, compaction_pending=false}}; handle_cast({release_snapshot, Snapshot}, State) -> - Rs = lists:keydelete(Snapshot, 1, State#state.registered_snapshots), leveled_log:log("I0003", [Snapshot]), - leveled_log:log("I0004", [length(Rs)]), - {noreply, State#state{registered_snapshots=Rs}}; + case lists:keydelete(Snapshot, 1, State#state.registered_snapshots) of + [] -> + {noreply, State#state{registered_snapshots=[]}}; + Rs -> + leveled_log:log("I0004", [length(Rs)]), + {noreply, State#state{registered_snapshots=Rs}} + end; handle_cast({log_level, LogLevel}, State) -> INC = State#state.clerk, ok = leveled_iclerk:clerk_loglevel(INC, LogLevel), diff --git a/src/leveled_log.erl b/src/leveled_log.erl index bcb8900..b5bc77e 100644 --- a/src/leveled_log.erl +++ b/src/leveled_log.erl @@ -56,7 +56,7 @@ {"B0008", {info, "Bucket list finds no more results"}}, {"B0009", - {info, "Bucket list finds Bucket ~w"}}, + {debug, "Bucket list finds Bucket ~w"}}, {"B0011", {warn, "Call to destroy the store and so all files to be removed"}}, {"B0013", @@ -191,7 +191,7 @@ {"PC006", {debug, "Work prompted but none needed"}}, {"PC007", - {info, "Clerk prompting Penciller regarding manifest change"}}, + {debug, "Clerk prompting Penciller regarding manifest change"}}, {"PC008", {info, "Merge from level ~w to merge into ~w files below"}}, {"PC009", @@ -269,9 +269,9 @@ {info, "Unexpected failure to fetch value for Key=~w SQN=~w " ++ "with reason ~w"}}, {"I0002", - {info, "Journal snapshot ~w registered at SQN ~w"}}, + {debug, "Journal snapshot ~w registered at SQN ~w"}}, {"I0003", - {info, "Journal snapshot ~w released"}}, + {debug, "Journal snapshot ~w released"}}, {"I0004", {info, "Remaining number of journal snapshots is ~w"}}, {"I0005", diff --git a/src/leveled_penciller.erl b/src/leveled_penciller.erl index 666b25f..40f0afa 100644 --- a/src/leveled_penciller.erl +++ b/src/leveled_penciller.erl @@ -234,7 +234,7 @@ -define(PROMPT_WAIT_ONL0, 5). -define(WORKQUEUE_BACKLOG_TOLERANCE, 4). -define(COIN_SIDECOUNT, 5). --define(SLOW_FETCH, 100000). +-define(SLOW_FETCH, 500000). % Log a very slow fetch - longer than 500ms -define(ITERATOR_SCANWIDTH, 4). -define(TIMING_SAMPLECOUNTDOWN, 10000). -define(TIMING_SAMPLESIZE, 100).