Merge pull request 'Garage v1.0.1' (#881) from rel-v1.0.1 into main

Reviewed-on: Deuxfleurs/garage#881

Cargo.lock

@@ -1304,7 +1304,7 @@ dependencies = [
 
 [[package]]
 name = "garage"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "assert-json-diff",
  "async-trait",
@@ -1360,7 +1360,7 @@ dependencies = [
 
 [[package]]
 name = "garage_api"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "aes-gcm",
  "argon2",
@@ -1415,7 +1415,7 @@ dependencies = [
 
 [[package]]
 name = "garage_block"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-compression",
@@ -1442,7 +1442,7 @@ dependencies = [
 
 [[package]]
 name = "garage_db"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "err-derive",
  "heed",
@@ -1456,7 +1456,7 @@ dependencies = [
 
 [[package]]
 name = "garage_model"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -1486,7 +1486,7 @@ dependencies = [
 
 [[package]]
 name = "garage_net"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -1512,7 +1512,7 @@ dependencies = [
 
 [[package]]
 name = "garage_rpc"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -1548,7 +1548,7 @@ dependencies = [
 
 [[package]]
 name = "garage_table"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -1570,7 +1570,7 @@ dependencies = [
 
 [[package]]
 name = "garage_util"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -1604,7 +1604,7 @@ dependencies = [
 
 [[package]]
 name = "garage_web"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "err-derive",
  "futures",

Cargo.nix

@@ -34,7 +34,7 @@ args@{
   ignoreLockHash,
 }:
 let
-  nixifiedLockHash = "c0aa85d369b22875a652356862a5810c22838970be9fbec558dd108d5232881d";
+  nixifiedLockHash = "466643eea782cd68c6f205858bb9e053aecdb18e2e58427b0527022aad596130";
   workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc;
   currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock);
   lockHashIgnored = if ignoreLockHash
@@ -58,17 +58,17 @@ in
 {
   cargo2nixVersion = "0.11.0";
   workspace = {
-    garage_db = rustPackages.unknown.garage_db."1.0.0";
+    garage_db = rustPackages.unknown.garage_db."1.0.1";
-    garage_util = rustPackages.unknown.garage_util."1.0.0";
+    garage_util = rustPackages.unknown.garage_util."1.0.1";
-    garage_net = rustPackages.unknown.garage_net."1.0.0";
+    garage_net = rustPackages.unknown.garage_net."1.0.1";
-    garage_rpc = rustPackages.unknown.garage_rpc."1.0.0";
+    garage_rpc = rustPackages.unknown.garage_rpc."1.0.1";
     format_table = rustPackages.unknown.format_table."0.1.1";
-    garage_table = rustPackages.unknown.garage_table."1.0.0";
+    garage_table = rustPackages.unknown.garage_table."1.0.1";
-    garage_block = rustPackages.unknown.garage_block."1.0.0";
+    garage_block = rustPackages.unknown.garage_block."1.0.1";
-    garage_model = rustPackages.unknown.garage_model."1.0.0";
+    garage_model = rustPackages.unknown.garage_model."1.0.1";
-    garage_api = rustPackages.unknown.garage_api."1.0.0";
+    garage_api = rustPackages.unknown.garage_api."1.0.1";
-    garage_web = rustPackages.unknown.garage_web."1.0.0";
+    garage_web = rustPackages.unknown.garage_web."1.0.1";
-    garage = rustPackages.unknown.garage."1.0.0";
+    garage = rustPackages.unknown.garage."1.0.1";
     k2v-client = rustPackages.unknown.k2v-client."0.0.4";
   };
   "registry+https://github.com/rust-lang/crates.io-index".addr2line."0.21.0" = overridableMkRustCrate (profileName: rec {
@@ -1910,9 +1910,9 @@ in
     };
   });
   
-  "unknown".garage."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/garage");
     features = builtins.concatLists [
@@ -1940,15 +1940,15 @@ in
       format_table = (rustPackages."unknown".format_table."0.1.1" { inherit profileName; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_api = (rustPackages."unknown".garage_api."1.0.0" { inherit profileName; }).out;
+      garage_api = (rustPackages."unknown".garage_api."1.0.1" { inherit profileName; }).out;
-      garage_block = (rustPackages."unknown".garage_block."1.0.0" { inherit profileName; }).out;
+      garage_block = (rustPackages."unknown".garage_block."1.0.1" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_model = (rustPackages."unknown".garage_model."1.0.0" { inherit profileName; }).out;
+      garage_model = (rustPackages."unknown".garage_model."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
-      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.0" { inherit profileName; }).out;
+      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.1" { inherit profileName; }).out;
-      garage_table = (rustPackages."unknown".garage_table."1.0.0" { inherit profileName; }).out;
+      garage_table = (rustPackages."unknown".garage_table."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
-      garage_web = (rustPackages."unknown".garage_web."1.0.0" { inherit profileName; }).out;
+      garage_web = (rustPackages."unknown".garage_web."1.0.1" { inherit profileName; }).out;
       git_version = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.9" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       sodiumoxide = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }).out;
@@ -1988,9 +1988,9 @@ in
     };
   });
   
-  "unknown".garage_api."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_api."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_api";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/api");
     features = builtins.concatLists [
@@ -2014,12 +2014,12 @@ in
       form_urlencoded = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".form_urlencoded."1.2.1" { inherit profileName; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_block = (rustPackages."unknown".garage_block."1.0.0" { inherit profileName; }).out;
+      garage_block = (rustPackages."unknown".garage_block."1.0.1" { inherit profileName; }).out;
-      garage_model = (rustPackages."unknown".garage_model."1.0.0" { inherit profileName; }).out;
+      garage_model = (rustPackages."unknown".garage_model."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
-      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.0" { inherit profileName; }).out;
+      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.1" { inherit profileName; }).out;
-      garage_table = (rustPackages."unknown".garage_table."1.0.0" { inherit profileName; }).out;
+      garage_table = (rustPackages."unknown".garage_table."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       hmac = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.12.1" { inherit profileName; }).out;
       http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."1.0.0" { inherit profileName; }).out;
@@ -2052,9 +2052,9 @@ in
     };
   });
   
-  "unknown".garage_block."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_block."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_block";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/block");
     features = builtins.concatLists [
@@ -2068,11 +2068,11 @@ in
       bytesize = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytesize."1.3.0" { inherit profileName; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
-      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.0" { inherit profileName; }).out;
+      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.1" { inherit profileName; }).out;
-      garage_table = (rustPackages."unknown".garage_table."1.0.0" { inherit profileName; }).out;
+      garage_table = (rustPackages."unknown".garage_table."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out;
       rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out;
@@ -2085,9 +2085,9 @@ in
     };
   });
   
-  "unknown".garage_db."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_db."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_db";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/db");
     features = builtins.concatLists [
@@ -2114,9 +2114,9 @@ in
     };
   });
   
-  "unknown".garage_model."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_model."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_model";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/model");
     features = builtins.concatLists [
@@ -2134,12 +2134,12 @@ in
       err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_block = (rustPackages."unknown".garage_block."1.0.0" { inherit profileName; }).out;
+      garage_block = (rustPackages."unknown".garage_block."1.0.1" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
-      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.0" { inherit profileName; }).out;
+      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.1" { inherit profileName; }).out;
-      garage_table = (rustPackages."unknown".garage_table."1.0.0" { inherit profileName; }).out;
+      garage_table = (rustPackages."unknown".garage_table."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."1.0.0" { inherit profileName; }).out;
       opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out;
@@ -2153,9 +2153,9 @@ in
     };
   });
   
-  "unknown".garage_net."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_net."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_net";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/net");
     features = builtins.concatLists [
@@ -2190,9 +2190,9 @@ in
     };
   });
   
-  "unknown".garage_rpc."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_rpc."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_rpc";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/rpc");
     features = builtins.concatLists [
@@ -2214,9 +2214,9 @@ in
       format_table = (rustPackages."unknown".format_table."0.1.1" { inherit profileName; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       gethostname = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.4.3" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       ipnet = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".ipnet."2.9.0" { inherit profileName; }).out;
@@ -2239,9 +2239,9 @@ in
     };
   });
   
-  "unknown".garage_table."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_table."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_table";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/table");
     dependencies = {
@@ -2250,9 +2250,9 @@ in
       bytes = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.5.0" { inherit profileName; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
       futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.30" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.0" { inherit profileName; }).out;
+      garage_rpc = (rustPackages."unknown".garage_rpc."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out;
       opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out;
@@ -2264,9 +2264,9 @@ in
     };
   });
   
-  "unknown".garage_util."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_util."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_util";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/util");
     features = builtins.concatLists [
@@ -2282,8 +2282,8 @@ in
       digest = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".digest."0.10.7" { inherit profileName; }).out;
       err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
-      garage_db = (rustPackages."unknown".garage_db."1.0.0" { inherit profileName; }).out;
+      garage_db = (rustPackages."unknown".garage_db."1.0.1" { inherit profileName; }).out;
-      garage_net = (rustPackages."unknown".garage_net."1.0.0" { inherit profileName; }).out;
+      garage_net = (rustPackages."unknown".garage_net."1.0.1" { inherit profileName; }).out;
       hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out;
       hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out;
       http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."1.0.0" { inherit profileName; }).out;
@@ -2308,18 +2308,18 @@ in
     };
   });
   
-  "unknown".garage_web."1.0.0" = overridableMkRustCrate (profileName: rec {
+  "unknown".garage_web."1.0.1" = overridableMkRustCrate (profileName: rec {
     name = "garage_web";
-    version = "1.0.0";
+    version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal (workspaceSrc + "/src/web");
     dependencies = {
       err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out;
       futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" { inherit profileName; }).out;
-      garage_api = (rustPackages."unknown".garage_api."1.0.0" { inherit profileName; }).out;
+      garage_api = (rustPackages."unknown".garage_api."1.0.1" { inherit profileName; }).out;
-      garage_model = (rustPackages."unknown".garage_model."1.0.0" { inherit profileName; }).out;
+      garage_model = (rustPackages."unknown".garage_model."1.0.1" { inherit profileName; }).out;
-      garage_table = (rustPackages."unknown".garage_table."1.0.0" { inherit profileName; }).out;
+      garage_table = (rustPackages."unknown".garage_table."1.0.1" { inherit profileName; }).out;
-      garage_util = (rustPackages."unknown".garage_util."1.0.0" { inherit profileName; }).out;
+      garage_util = (rustPackages."unknown".garage_util."1.0.1" { inherit profileName; }).out;
       http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."1.0.0" { inherit profileName; }).out;
       http_body_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http-body-util."0.1.0" { inherit profileName; }).out;
       hyper = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."1.1.0" { inherit profileName; }).out;

Cargo.toml

@@ -21,15 +21,15 @@ default-members = ["src/garage"]
 
 # Internal Garage crates
 format_table = { version = "0.1.1", path = "src/format-table" }
-garage_api = { version = "1.0.0", path = "src/api" }
+garage_api = { version = "1.0.1", path = "src/api" }
-garage_block = { version = "1.0.0", path = "src/block" }
+garage_block = { version = "1.0.1", path = "src/block" }
-garage_db = { version = "1.0.0", path = "src/db", default-features = false }
+garage_db = { version = "1.0.1", path = "src/db", default-features = false }
-garage_model = { version = "1.0.0", path = "src/model", default-features = false }
+garage_model = { version = "1.0.1", path = "src/model", default-features = false }
-garage_net = { version = "1.0.0", path = "src/net" }
+garage_net = { version = "1.0.1", path = "src/net" }
-garage_rpc = { version = "1.0.0", path = "src/rpc" }
+garage_rpc = { version = "1.0.1", path = "src/rpc" }
-garage_table = { version = "1.0.0", path = "src/table" }
+garage_table = { version = "1.0.1", path = "src/table" }
-garage_util = { version = "1.0.0", path = "src/util" }
+garage_util = { version = "1.0.1", path = "src/util" }
-garage_web = { version = "1.0.0", path = "src/web" }
+garage_web = { version = "1.0.1", path = "src/web" }
 k2v-client = { version = "0.0.4", path = "src/k2v-client" }
 
 # External crates from crates.io

doc/book/cookbook/real-world.md

@@ -96,14 +96,14 @@ to store 2 TB of data in total.
 ## Get a Docker image
 
 Our docker image is currently named `dxflrs/garage` and is stored on the [Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).
-We encourage you to use a fixed tag (eg. `v1.0.0`) and not the `latest` tag.
+We encourage you to use a fixed tag (eg. `v1.0.1`) and not the `latest` tag.
-For this example, we will use the latest published version at the time of the writing which is `v1.0.0` but it's up to you
+For this example, we will use the latest published version at the time of the writing which is `v1.0.1` but it's up to you
 to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).
 
 For example:
 
 ```
-sudo docker pull dxflrs/garage:v1.0.0
+sudo docker pull dxflrs/garage:v1.0.1
 ```
 
 ## Deploying and configuring Garage
@@ -171,7 +171,7 @@ docker run \
   -v /etc/garage.toml:/etc/garage.toml \
   -v /var/lib/garage/meta:/var/lib/garage/meta \
   -v /var/lib/garage/data:/var/lib/garage/data \
-  dxflrs/garage:v1.0.0
+  dxflrs/garage:v1.0.1
 ```
 
 With this command line, Garage should be started automatically at each boot.
@@ -185,7 +185,7 @@ If you want to use `docker-compose`, you may use the following `docker-compose.y
 version: "3"
 services:
   garage:
-    image: dxflrs/garage:v1.0.0
+    image: dxflrs/garage:v1.0.1
     network_mode: "host"
     restart: unless-stopped
     volumes:

doc/drafts/admin-api.md

@@ -70,7 +70,7 @@ Example response body:
 ```json
 {
   "node": "b10c110e4e854e5aa3f4637681befac755154b20059ec163254ddbfae86b09df",
-  "garageVersion": "v1.0.0",
+  "garageVersion": "v1.0.1",
   "garageFeatures": [
     "k2v",
     "lmdb",

script/helm/garage/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 0.5.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.0.0"
+appVersion: "v1.0.1"

src/api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/block/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_block"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/db/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_db"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/db/lib.rs

@@ -274,12 +274,12 @@ impl<'a> Transaction<'a> {
 		tree: &Tree,
 		key: T,
 		value: U,
-	) -> TxOpResult<Option<Value>> {
+	) -> TxOpResult<()> {
 		self.tx.insert(tree.1, key.as_ref(), value.as_ref())
 	}
 	/// Returns the old value if there was one
 	#[inline]
-	pub fn remove<T: AsRef<[u8]>>(&mut self, tree: &Tree, key: T) -> TxOpResult<Option<Value>> {
+	pub fn remove<T: AsRef<[u8]>>(&mut self, tree: &Tree, key: T) -> TxOpResult<()> {
 		self.tx.remove(tree.1, key.as_ref())
 	}
 	/// Clears all values in a tree
@@ -362,8 +362,8 @@ pub(crate) trait ITx {
 	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>>;
 	fn len(&self, tree: usize) -> TxOpResult<usize>;
 
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>>;
+	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<()>;
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>>;
+	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<()>;
 	fn clear(&mut self, tree: usize) -> TxOpResult<()>;
 
 	fn iter(&self, tree: usize) -> TxOpResult<TxValueIter<'_>>;

src/db/lmdb_adapter.rs

@@ -252,17 +252,15 @@ impl<'a> ITx for LmdbTx<'a> {
 		Ok(tree.len(&self.tx)? as usize)
 	}
 
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>> {
+	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<()> {
 		let tree = *self.get_tree(tree)?;
-		let old_val = tree.get(&self.tx, key)?.map(Vec::from);
 		tree.put(&mut self.tx, key, value)?;
-		Ok(old_val)
+		Ok(())
 	}
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
+	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<()> {
 		let tree = *self.get_tree(tree)?;
-		let old_val = tree.get(&self.tx, key)?.map(Vec::from);
 		tree.delete(&mut self.tx, key)?;
-		Ok(old_val)
+		Ok(())
 	}
 	fn clear(&mut self, tree: usize) -> TxOpResult<()> {
 		let tree = *self.get_tree(tree)?;

src/db/sqlite_adapter.rs

@@ -192,7 +192,7 @@ impl IDb for SqliteDb {
 		let db = self.db.get()?;
 		let lock = self.write_lock.lock();
 
-		let n = db.execute(&format!("DELETE FROM {} WHERE k = ?1", tree), params![key])?;
+		db.execute(&format!("DELETE FROM {} WHERE k = ?1", tree), params![key])?;
 
 		drop(lock);
 		Ok(())
@@ -336,31 +336,17 @@ impl<'a> ITx for SqliteTx<'a> {
 		}
 	}
 
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<Option<Value>> {
+	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<()> {
 		let tree = self.get_tree(tree)?;
-		let old_val = self.internal_get(tree, key)?;
+		let sql = format!("INSERT OR REPLACE INTO {} (k, v) VALUES (?1, ?2)", tree);
-
+		self.tx.execute(&sql, params![key, value])?;
-		let sql = match &old_val {
+		Ok(())
-			Some(_) => format!("UPDATE {} SET v = ?2 WHERE k = ?1", tree),
-			None => format!("INSERT INTO {} (k, v) VALUES (?1, ?2)", tree),
-		};
-		let n = self.tx.execute(&sql, params![key, value])?;
-		assert_eq!(n, 1);
-
-		Ok(old_val)
 	}
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
+	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<()> {
 		let tree = self.get_tree(tree)?;
-		let old_val = self.internal_get(tree, key)?;
+		self.tx
-
-		if old_val.is_some() {
-			let n = self
-				.tx
 			.execute(&format!("DELETE FROM {} WHERE k = ?1", tree), params![key])?;
-			assert_eq!(n, 1);
+		Ok(())
-		}
-
-		Ok(old_val)
 	}
 	fn clear(&mut self, tree: usize) -> TxOpResult<()> {
 		let tree = self.get_tree(tree)?;

src/db/test.rs

@@ -21,7 +21,7 @@ fn test_suite(db: Db) {
 	let res = db.transaction::<_, (), _>(|tx| {
 		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), va);
 
-		assert_eq!(tx.insert(&tree, ka, vb).unwrap().unwrap(), va);
+		assert_eq!(tx.insert(&tree, ka, vb).unwrap(), ());
 
 		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
 
@@ -33,7 +33,7 @@ fn test_suite(db: Db) {
 	let res = db.transaction::<(), _, _>(|tx| {
 		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
 
-		assert_eq!(tx.insert(&tree, ka, vc).unwrap().unwrap(), vb);
+		assert_eq!(tx.insert(&tree, ka, vc).unwrap(), ());
 
 		assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vc);
 

src/garage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/garage/cli/layout.rs

@@ -358,7 +358,7 @@ pub async fn cmd_layout_history(
 
 	if layout.versions.len() > 1 {
 		println!("==== UPDATE TRACKERS ====");
-		println!("Several layout versions are currently live in the version, and data is being migrated.");
+		println!("Several layout versions are currently live in the cluster, and data is being migrated.");
 		println!(
 			"This is the internal data that Garage stores to know which nodes have what data."
 		);
@@ -377,15 +377,27 @@ pub async fn cmd_layout_history(
 		table[1..].sort();
 		format_table(table);
 
+		let min_ack = layout
+			.update_trackers
+			.ack_map
+			.min_among(&all_nodes, layout.min_stored());
+
 		println!();
 		println!(
 			"If some nodes are not catching up to the latest layout version in the update trackers,"
 		);
 		println!("it might be because they are offline or unable to complete a sync successfully.");
+		if min_ack < layout.current().version {
 			println!(
 				"You may force progress using `garage layout skip-dead-nodes --version {}`",
 				layout.current().version
 			);
+		} else {
+			println!(
+				"You may force progress using `garage layout skip-dead-nodes --version {} --allow-missing-data`.",
+				layout.current().version
+			);
+		}
 	} else {
 		println!("Your cluster is currently in a stable state with a single live layout version.");
 		println!("No metadata migration is in progress. Note that the migration of data blocks is not tracked,");
@@ -426,15 +438,15 @@ pub async fn cmd_layout_skip_dead_nodes(
 	let all_nodes = layout.get_all_nodes();
 	let mut did_something = false;
 	for node in all_nodes.iter() {
-		if status.iter().any(|x| x.id == *node && x.is_up) {
+		// Update ACK tracker for dead nodes or for all nodes if --allow-missing-data
-			continue;
+		if opt.allow_missing_data || !status.iter().any(|x| x.id == *node && x.is_up) {
-		}
-
 			if layout.update_trackers.ack_map.set_max(*node, opt.version) {
 				println!("Increased the ACK tracker for node {:?}", node);
 				did_something = true;
 			}
+		}
 
+		// If --allow-missing-data, update SYNC tracker for all nodes.
 		if opt.allow_missing_data {
 			if layout.update_trackers.sync_map.set_max(*node, opt.version) {
 				println!("Increased the SYNC tracker for node {:?}", node);

src/model/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/net/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_net"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/rpc/layout/mod.rs

@@ -455,7 +455,7 @@ impl UpdateTracker {
 		}
 	}
 
-	pub(crate) fn min_among(&self, storage_nodes: &[Uuid], min_version: u64) -> u64 {
+	pub fn min_among(&self, storage_nodes: &[Uuid], min_version: u64) -> u64 {
 		storage_nodes
 			.iter()
 			.map(|x| self.get(x, min_version))

src/table/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/util/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_web"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
 edition = "2018"
 license = "AGPL-3.0"