Skip to content

Properly clean up db bench dirs after bench is done. #18119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glyh wants to merge 1 commit into
base: georgeee/db-bench
Choose a base branch
from
Open

Properly clean up db bench dirs after bench is done. #18119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions src/test/db_benchmark/common.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,8 @@ module Ops = struct
read_key (module Db) db key
end

(* Temporary directory management *)
let make_temp_dir prefix =
let pid = Unix.getpid () |> Pid.to_int in
let dir_name = Printf.sprintf "%s_%d" prefix pid in
Unix.mkdir_p dir_name ; dir_name

let cleanup_temp_dir dir =
match Sys.file_exists dir with
| `Yes ->
ignore
( Core_unix.system (Printf.sprintf "rm -rf %s" (Filename.quote dir))
: Core_unix.Exit_or_signal.t )
| _ ->
()
let with_temp_dir prefix ~f =
let dir_name = Unix.mkdtemp prefix in
Fun.protect
~finally:(fun () -> Mina_stdlib_unix.File_system.rmrf dir_name)
(fun () -> f dir_name)
8 changes: 4 additions & 4 deletions src/test/db_benchmark/db_benchmark.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ module Single_file_db = Single_file_impl.Make ()

module Multi_file_db = Multi_file_impl.Make ()

let init_db (type db) (module Db : Common.Database with type t = db) name =
let init_db (type db) ~dir (module Db : Common.Database with type t = db) name =
(* Initialization: create DB and warmup *)
let dir = Common.make_temp_dir (Printf.sprintf "db_bench_%s" name) in
let db = Db.create dir in
Common.Ops.warmup (module Db) db ;
eprintf "Warmup complete for %s\n" name ;
Expand All @@ -37,8 +36,9 @@ let make_read_bench (type db) (module Db : Common.Database with type t = db)

let test ~name (type db) (module Db : Common.Database with type t = db)
(f : (module Common.Database with type t = db) -> db -> unit -> unit) =
Bench.Test.create_with_initialization ~name (fun `init ->
init_db (module Db) name |> f (module Db) )
Common.with_temp_dir name ~f:(fun dir ->
Bench.Test.create_with_initialization ~name (fun `init () ->
init_db ~dir (module Db) name |> f (module Db) ) )

(* Create all benchmarks *)
let all_benchmarks () =
Expand Down