Deps: adapt to irmin 3.8

Irmin 3.8 unifies 3 LRUs into 1 so we allow 3 more items into the unified LRU See mirage/irmin#2254
tezos · Dec 15, 2023 · bb853f6 · bb853f6
1 parent 8d58923
commit bb853f6
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 23 deletions.
diff --git a/manifest/main.ml b/manifest/main.ml
@@ -172,10 +172,10 @@ let ipaddr =
 
 let ipaddr_unix = external_sublib ipaddr "ipaddr.unix"
 
-let irmin = external_lib "irmin" V.(at_least "3.7.2" && less_than "3.8.0")
+let irmin = external_lib "irmin" V.(at_least "3.8.0" && less_than "3.9.0")
 
 let irmin_pack =
-  external_lib "irmin-pack" V.(at_least "3.7.2" && less_than "3.8.0")
+  external_lib "irmin-pack" V.(at_least "3.8.0" && less_than "3.9.0")
 
 let irmin_pack_unix = external_sublib irmin_pack "irmin-pack.unix"
 

diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam
@@ -15,8 +15,8 @@ depends: [
   "tezos-dac-lib"
   "tezos-dac-node-lib"
   "octez-l2-libs"
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "octez-protocol-017-PtNairob-libs"
   "octez-protocol-018-Proxford-libs"
 ]

diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam
@@ -16,8 +16,8 @@ depends: [
   "tezos-dal-node-lib"
   "tezos-dal-node-services"
   "octez-l2-libs"
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "prometheus-app" { >= "1.2" }
   "prometheus" { >= "1.2" }
   "octez-protocol-017-PtNairob-libs"

diff --git a/opam/octez-l2-libs.opam b/opam/octez-l2-libs.opam
@@ -19,8 +19,8 @@ depends: [
   "tezos-rust-libs" { = "1.6" }
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
   "index" { >= "1.6.0" & < "1.7.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "aches-lwt" { >= "1.0.0" }
   "yaml" { >= "3.1.0" }
   "ppx_import"

diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam
@@ -50,13 +50,13 @@ depends: [
   "aches-lwt" { >= "1.0.0" }
   "ipaddr" { >= "5.3.0" & < "6.0.0" }
   "ptime" { >= "1.1.0" }
-  "mtime" { >= "1.4.0" & < "2.0.0" }
+  "mtime" { >= "2.0.0" }
   "conf-libev"
   "uutf"
   "ringo" { >= "1.0.0" }
   "qcheck-core" {with-test}
-  "irmin" { >= "3.7.2" & < "3.8.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
   "conf-rust"
   "integers"
   "integers_stubs_js"

diff --git a/opam/octez-shell-libs.opam b/opam/octez-shell-libs.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-version"
   "aches-lwt" { >= "1.0.0" }
   "index" { >= "1.6.0" & < "1.7.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
   "camlzip" { >= "1.11" & < "1.12" }
   "tar"
   "tar-unix" { >= "2.0.1" & < "3.0.0" }

diff --git a/opam/octez-smart-rollup-node-Proxford.opam b/opam/octez-smart-rollup-node-Proxford.opam
@@ -21,8 +21,8 @@ depends: [
   "octez-l2-libs"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "aches" { >= "1.0.0" }
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"

diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam
@@ -20,8 +20,8 @@ depends: [
   "octez-l2-libs"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "aches" { >= "1.0.0" }
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"

diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam
@@ -21,8 +21,8 @@ depends: [
   "octez-l2-libs"
   "octez-crawler"
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
   "aches" { >= "1.0.0" }
   "aches-lwt" { >= "1.0.0" }
   "octez-injector"

diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam
@@ -44,8 +44,8 @@ depends: [
   "integers"
   "integers_stubs_js"
   "ipaddr" { >= "5.3.0" & < "6.0.0" }
-  "irmin" { >= "3.7.2" & < "3.8.0" }
-  "irmin-pack" { >= "3.7.2" & < "3.8.0" }
+  "irmin" { >= "3.8.0" & < "3.9.0" }
+  "irmin-pack" { >= "3.8.0" & < "3.9.0" }
   "jingoo"
   "json-data-encoding" { >= "0.12" & < "0.13" }
   "lambda-term" { >= "3.3.1" }

diff --git a/src/bin_dal_node/constants.ml b/src/bin_dal_node/constants.ml
@@ -31,9 +31,11 @@ let shards_store_lru_size =
      cache. Each entry in the cache maintains two open file descriptors (one via
      regular file opening and one via mmap on the bitset region). Note that setting
      a too high value causes a "Too many open files" error. *)
+  let irmin_internals_entries_per_toplevel_entry = 3 in
   let number_of_slots = 256 in
   let number_of_remembered_levels = 1 in
-  number_of_slots * number_of_remembered_levels
+  irmin_internals_entries_per_toplevel_entry * number_of_slots
+  * number_of_remembered_levels
 
 (* Fewer cache sizes should be enough in practice,
    but we cache 50 since each cache entry has quite a small memory footprint. *)

diff --git a/src/lib_context/helpers/env.ml b/src/lib_context/helpers/env.ml
@@ -47,7 +47,7 @@ let index_log_size = 2_500_000
 (* Caps the number of entries stored in the Irmin's LRU cache. As a
    trade-off, increasing this value will increase the memory
    consumption.*)
-let lru_size = 5_000
+let lru_size = 15_000
 
 (* This limit ensures that no trees with more than [auto_flush]
    mutations can exist in memory, bounding the memory usage of a

diff --git a/src/lib_smart_rollup_node/configuration.ml b/src/lib_smart_rollup_node/configuration.ml
@@ -599,7 +599,7 @@ let refutation_player_buffer_levels = 5
 
 let default_index_buffer_size = 10_000
 
-let default_irmin_cache_size = 100_000
+let default_irmin_cache_size = 300_000
 
 let loser_warning_message config =
   if config.loser_mode <> Loser_mode.no_failures then