From 5a1eb0fb381e39e35e6bd84a65362bdb6a95c136 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Tue, 8 Jul 2025 14:12:18 +0200 Subject: [PATCH] Store: remove obsolete upgrade from 3.0 to 3.1 --- src/lib_node_config/data_version.ml | 11 ------ src/lib_store/mocked/store.ml | 2 -- src/lib_store/store.mli | 3 -- src/lib_store/unix/block_store.ml | 52 ----------------------------- src/lib_store/unix/block_store.mli | 3 -- src/lib_store/unix/store.ml | 8 ----- src/lib_store/unix/store.mli | 3 -- 7 files changed, 82 deletions(-) diff --git a/src/lib_node_config/data_version.ml b/src/lib_node_config/data_version.ml index db34381897c9..53dee24b8475 100644 --- a/src/lib_node_config/data_version.ml +++ b/src/lib_node_config/data_version.ml @@ -106,8 +106,6 @@ end (* FIXME https://gitlab.com/tezos/tezos/-/issues/2861 We should enable the semantic versioning instead of applying hardcoded rules.*) -let v_3_0 = Version.make ~major:3 ~minor:0 - let v_3_1 = Version.make ~major:3 ~minor:1 let v_3_2 = Version.make ~major:3 ~minor:2 @@ -126,20 +124,11 @@ let current_version = v_3_2 - we want to deprecate a specific upgrade *) let upgradable_data_version = - let open Lwt_result_syntax in - let v_3_1_upgrade ~data_dir genesis = - let store_dir = store_dir data_dir in - Store.Upgrade.v_3_1_upgrade ~store_dir genesis - in let v_3_2_upgrade ~data_dir genesis = let store_dir = store_dir data_dir in Store.Upgrade.v_3_2_upgrade ~store_dir genesis in [ - ( v_3_0, - fun ~data_dir genesis ~chain_name:_ ~sandbox_parameters:_ -> - let* () = v_3_1_upgrade ~data_dir genesis in - v_3_2_upgrade ~data_dir genesis ); ( v_3_1, fun ~data_dir genesis ~chain_name:_ ~sandbox_parameters:_ -> v_3_2_upgrade ~data_dir genesis ); diff --git a/src/lib_store/mocked/store.ml b/src/lib_store/mocked/store.ml index ecb022b02a96..4b316f3f891e 100644 --- a/src/lib_store/mocked/store.ml +++ b/src/lib_store/mocked/store.ml @@ -2090,7 +2090,5 @@ module Utilities = struct end module Upgrade = struct - let v_3_1_upgrade ~store_dir:_ _genesis = Lwt_result_syntax.return_unit - let v_3_2_upgrade ~store_dir:_ _genesis = Lwt_result_syntax.return_unit end diff --git a/src/lib_store/store.mli b/src/lib_store/store.mli index ade68f459c86..2886b70da29b 100644 --- a/src/lib_store/store.mli +++ b/src/lib_store/store.mli @@ -1051,9 +1051,6 @@ end (** Upgrade module gathering all available upgrades. *) module Upgrade : sig - (** Upgrade the block_store_status in v_3_1. *) - val v_3_1_upgrade : store_dir:string -> Genesis.t -> unit tzresult Lwt.t - (** Upgrade the offset format for cemented files in v_3_2. *) val v_3_2_upgrade : store_dir:string -> Genesis.t -> unit tzresult Lwt.t end diff --git a/src/lib_store/unix/block_store.ml b/src/lib_store/unix/block_store.ml index 9a662df6eb97..5cf3c4840a16 100644 --- a/src/lib_store/unix/block_store.ml +++ b/src/lib_store/unix/block_store.ml @@ -2026,55 +2026,3 @@ let close block_store = let stat_metadata_cycles block_store = Cemented_block_store.stat_metadata_cycles block_store.cemented_store - -(***************** Upgrade to V3.1 *****************) - -type error += Unexpected_status_encoding of string - -let () = - let open Data_encoding in - register_error_kind - `Permanent - ~id:"block_store.unexpected_status_encoding" - ~title:"Unexpected status encoding" - ~description:"The status file encoding found is not the expected one." - ~pp:(fun ppf path -> - Format.fprintf - ppf - "The status format found at %s is invalid. Please delete the file for \ - a proper upgrade." - path) - (obj1 (req "path " string)) - (function Unexpected_status_encoding path -> Some path | _ -> None) - (fun path -> Unexpected_status_encoding path) - -let v_3_1_upgrade chain_dir = - let open Lwt_result_syntax in - let legacy_block_store_status_file = - Naming.legacy_block_store_status_file chain_dir - in - let*! exists = Lwt_unix.file_exists legacy_block_store_status_file.path in - if exists then - (* Load using the legacy block_store_status encoding *) - let*! () = Store_events.(emit load_block_store_status ()) in - let*! legacy_status_data = - Stored_data.init - legacy_block_store_status_file - ~initial_data:Block_store_status.Legacy.create_idle_status - in - let* legacy_status_data = - match legacy_status_data with - | Ok legacy_status_data -> return legacy_status_data - | Error _exn -> - tzfail - (Unexpected_status_encoding legacy_block_store_status_file.path) - in - (* Convert to the new encoding *) - let* status = Block_store_status.of_legacy legacy_status_data in - (* Overwrite the status file *) - let* () = - Stored_data.write_file (Naming.block_store_status_file chain_dir) status - in - let*! () = Store_events.(emit fixed_block_store_status ()) in - return_unit - else (* The store is not containing any data to upgrade yet.*) return_unit diff --git a/src/lib_store/unix/block_store.mli b/src/lib_store/unix/block_store.mli index af331148fe47..9261684c9d8e 100644 --- a/src/lib_store/unix/block_store.mli +++ b/src/lib_store/unix/block_store.mli @@ -395,6 +395,3 @@ val may_recover_merge : block_store -> unit tzresult Lwt.t store's metadata. *) val stat_metadata_cycles : t -> (string * metadata_stat list) list tzresult Lwt.t - -(** Upgrade the block_store_status. *) -val v_3_1_upgrade : [`Chain_dir] Naming.directory -> unit tzresult Lwt.t diff --git a/src/lib_store/unix/store.ml b/src/lib_store/unix/store.ml index 3ec47b2a0971..e8f5f8535556 100644 --- a/src/lib_store/unix/store.ml +++ b/src/lib_store/unix/store.ml @@ -3624,14 +3624,6 @@ module Utilities = struct end module Upgrade = struct - let v_3_1_upgrade ~store_dir genesis = - (* Hypothesis: The node storage version is 3.0 *) - let chain_id = Chain_id.of_block_hash genesis.Genesis.block in - let chain_dir = - Naming.chain_dir (Naming.store_dir ~dir_path:store_dir) chain_id - in - Block_store.v_3_1_upgrade chain_dir - let v_3_2_upgrade ~store_dir genesis = let chain_id = Chain_id.of_block_hash genesis.Genesis.block in let chain_dir = diff --git a/src/lib_store/unix/store.mli b/src/lib_store/unix/store.mli index 605c3f225966..b74c8de1e939 100644 --- a/src/lib_store/unix/store.mli +++ b/src/lib_store/unix/store.mli @@ -1053,9 +1053,6 @@ end (** Upgrade module gathering all available upgrades. *) module Upgrade : sig - (** Upgrade the block_store_status in v_3_1. *) - val v_3_1_upgrade : store_dir:string -> Genesis.t -> unit tzresult Lwt.t - (** Upgrade the offset format for cemented files in v_3_2. *) val v_3_2_upgrade : store_dir:string -> Genesis.t -> unit tzresult Lwt.t end -- GitLab