From 392b7e705777af715faca54d7d2f63cad3af6443 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Thu, 13 Feb 2025 16:45:51 +0100 Subject: [PATCH 1/4] Store: Storage_maintenance always set as auto --- src/lib_store/unix/store.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_store/unix/store.ml b/src/lib_store/unix/store.ml index c38a80b604bb..523ff3b70a8e 100644 --- a/src/lib_store/unix/store.ml +++ b/src/lib_store/unix/store.ml @@ -3057,7 +3057,7 @@ let check_history_mode_consistency chain_dir history_mode = let init ?patch_context ?commit_genesis ?history_mode ?(readonly = false) ?block_cache_limit ?(disable_context_pruning = false) - ?(maintenance_delay = Storage_maintenance.Disabled) ~store_dir ~context_dir + ?(maintenance_delay = Storage_maintenance.Auto) ~store_dir ~context_dir ~allow_testchains genesis = let open Lwt_result_syntax in let*! () = -- GitLab From c2501b086a9c3243c55992f694ec05ec418de048 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Thu, 13 Feb 2025 17:02:43 +0100 Subject: [PATCH 2/4] Store: introduce storage maintenance status event --- src/lib_store/shared/store_events.ml | 9 +++++++++ src/lib_store/unix/store.ml | 1 + 2 files changed, 10 insertions(+) diff --git a/src/lib_store/shared/store_events.ml b/src/lib_store/shared/store_events.ml index 354944850999..2a8ab704d50f 100644 --- a/src/lib_store/shared/store_events.ml +++ b/src/lib_store/shared/store_events.ml @@ -278,6 +278,15 @@ let end_merging_stores = ~pp1:Time.System.Span.pp_hum ("time", Time.System.Span.encoding) +let maintenance_status = + declare_1 + ~section + ~level:Info + ~name:"delayed_maintenance_status" + ~msg:"delayed storage maintenance set to {mode}" + ~pp1:Storage_maintenance.pp_delay + ("mode", Storage_maintenance.delay_encoding) + let delay_store_merging = declare_2 ~section diff --git a/src/lib_store/unix/store.ml b/src/lib_store/unix/store.ml index 523ff3b70a8e..b691f8962785 100644 --- a/src/lib_store/unix/store.ml +++ b/src/lib_store/unix/store.ml @@ -3063,6 +3063,7 @@ let init ?patch_context ?commit_genesis ?history_mode ?(readonly = false) let*! () = Store_events.(emit init_store) (readonly, disable_context_pruning) in + let*! () = Store_events.(emit maintenance_status maintenance_delay) in let store_dir = Naming.store_dir ~dir_path:store_dir in let chain_id = Chain_id.of_block_hash genesis.Genesis.block in let chain_dir = Naming.chain_dir store_dir chain_id in -- GitLab From 3a53d76d3800ba38ba26203dc3b6b23307eefc62 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Tue, 18 Feb 2025 09:21:00 +0100 Subject: [PATCH 3/4] Shell: avoid default config values being persisted --- src/lib_shell_services/shell_limits.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_shell_services/shell_limits.ml b/src/lib_shell_services/shell_limits.ml index 5dcd2b802db8..52335d0f8d2b 100644 --- a/src/lib_shell_services/shell_limits.ml +++ b/src/lib_shell_services/shell_limits.ml @@ -266,8 +266,8 @@ let default_limits = peer_validator_limits = default_peer_validator_limits; chain_validator_limits = default_chain_validator_limits; history_mode = None; - disable_context_pruning = Some false; - storage_maintenance_delay = Some Auto; + disable_context_pruning = None; + storage_maintenance_delay = None; } let limits_encoding = -- GitLab From c9f5c980f2b546afd6d1bb1149bc0ee8db7d08e4 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Mon, 17 Feb 2025 17:55:26 +0100 Subject: [PATCH 4/4] Tests: disable maintenance for store tests --- src/lib_store/unix/test/test_utils.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib_store/unix/test/test_utils.ml b/src/lib_store/unix/test/test_utils.ml index 08b7f15fd992..dd70b3aa5988 100644 --- a/src/lib_store/unix/test/test_utils.ml +++ b/src/lib_store/unix/test/test_utils.ml @@ -323,6 +323,7 @@ let wrap_simple_store_init ?(patch_context = dummy_patch_context) ~store_dir ~context_dir ~allow_testchains + ~maintenance_delay:Disabled genesis in if with_gc then ( -- GitLab