From 2317ae2724e26487f75c5c7fb08c08e3ff00e056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20W=C3=BCnsche?= Date: Tue, 10 Oct 2023 17:26:54 +0200 Subject: [PATCH 1/2] haura: bump MSRV --- bectl/Cargo.toml | 2 +- betree/Cargo.toml | 2 +- julea-betree/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bectl/Cargo.toml b/bectl/Cargo.toml index b6890505..7d9f9161 100644 --- a/bectl/Cargo.toml +++ b/bectl/Cargo.toml @@ -3,7 +3,7 @@ name = "bectl" version = "0.1.0" authors = ["tilpner ", "Johannes Wünsche "] edition = "2021" -rust-version = "1.65" +rust-version = "1.66.1" [dependencies] betree_storage_stack = { path = "../betree", features = [ "internal-api" ] } diff --git a/betree/Cargo.toml b/betree/Cargo.toml index 4c738b6d..38af4375 100644 --- a/betree/Cargo.toml +++ b/betree/Cargo.toml @@ -4,7 +4,7 @@ version = "0.3.1-alpha" authors = ["Felix Wiedemann ", "Till Hoeppner ", "Johannes Wünsche "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.66.1" [lib] crate-type = ["rlib", "staticlib", "cdylib"] diff --git a/julea-betree/Cargo.toml b/julea-betree/Cargo.toml index ee551915..27dad7ca 100644 --- a/julea-betree/Cargo.toml +++ b/julea-betree/Cargo.toml @@ -3,7 +3,7 @@ name = "julea-betree" version = "0.1.0" authors = ["tilpner "] edition = "2018" -rust-version = "1.65" +rust-version = "1.66.1" [lib] name = "object_betree" From 874d01dd473b64aae88fac219125fc337e06c1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20W=C3=BCnsche?= Date: Tue, 10 Oct 2023 16:36:23 +0200 Subject: [PATCH 2/2] fio: check for proper maximum file size --- fio-haura/src/fio-engine-haura.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fio-haura/src/fio-engine-haura.c b/fio-haura/src/fio-engine-haura.c index 5aa16a6e..99914b7e 100644 --- a/fio-haura/src/fio-engine-haura.c +++ b/fio-haura/src/fio-engine-haura.c @@ -304,10 +304,8 @@ static int fio_haura_setup(struct thread_data *td) { /* Haura needs some additional space to provide extra data like object * pointers and metadata. This is more of a hack, but nonetheless. */ creat(td->files[idx]->file_name, 0644); - if (truncate(td->files[idx]->file_name, td->o.size + (50 * 1024 * 1024))) { - fprintf( - stderr, - "Could not retruncate file to provide enough storage for Haura.\n"); + if (truncate(td->files[idx]->file_name, max(td->o.file_size_high, td->o.size) + (50 * 1024 * 1024))) { + fprintf(stderr,"Could not retruncate file to provide enough storage for Haura.\n"); } }