Merge pull request 'Fix all typos' (#928) from majst01/garage:fix-typos into main

Reviewed-on: Deuxfleurs/garage#928
Reviewed-by: maximilien <me@mricher.fr>

.woodpecker/debug.yaml

@@ -16,7 +16,7 @@ steps:
   - name: build
     image: nixpkgs/nix:nixos-22.05
     commands:
-      - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
+      - nix-build --no-build-output --attr pkgs.amd64.debug --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
 
   - name: unit + func tests
     image: nixpkgs/nix:nixos-22.05
@@ -24,7 +24,7 @@ steps:
       GARAGE_TEST_INTEGRATION_EXE: result-bin/bin/garage
       GARAGE_TEST_INTEGRATION_PATH: tmp-garage-integration
     commands:
-      - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
+      - nix-build --no-build-output --attr pkgs.amd64.debug --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
       - nix-build --no-build-output --attr test.amd64
       - ./result/bin/garage_db-*
       - ./result/bin/garage_api-*
@@ -37,13 +37,11 @@ steps:
       - GARAGE_TEST_INTEGRATION_DB_ENGINE=lmdb ./result/bin/integration-* || (cat tmp-garage-integration/stderr.log; false)
       - nix-shell --attr ci --run "killall -9 garage" || true
       - GARAGE_TEST_INTEGRATION_DB_ENGINE=sqlite ./result/bin/integration-* || (cat tmp-garage-integration/stderr.log; false)
-      - nix-shell --attr ci --run "killall -9 garage" || true
-      - GARAGE_TEST_INTEGRATION_DB_ENGINE=rocksdb ./result/bin/integration-* || (cat tmp-garage-integration/stderr.log; false)
       - rm result
       - rm -rv tmp-garage-integration
 
   - name: integration tests
     image: nixpkgs/nix:nixos-22.05
     commands:
-      - nix-build --no-build-output --attr clippy.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
+      - nix-build --no-build-output --attr pkgs.amd64.debug --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}
       - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)

.woodpecker/publish.yaml

@@ -9,11 +9,11 @@ depends_on:
 steps:
   - name: refresh-index
     image: nixpkgs/nix:nixos-22.05
-    secrets:
+    environment:
-      - source: garagehq_aws_access_key_id
+      AWS_ACCESS_KEY_ID:
-        target: AWS_ACCESS_KEY_ID
+        from_secret: garagehq_aws_access_key_id
-      - source: garagehq_aws_secret_access_key
+      AWS_SECRET_ACCESS_KEY:
-        target: AWS_SECRET_ACCESS_KEY
+        from_secret: garagehq_aws_secret_access_key
     commands:
       - mkdir -p /etc/nix && cp nix/nix.conf /etc/nix/nix.conf
       - nix-shell --attr ci --run "refresh_index"

.woodpecker/release.yaml

@@ -48,11 +48,10 @@ steps:
     image: nixpkgs/nix:nixos-22.05
     environment:
       TARGET: "${TARGET}"
-    secrets:
+      AWS_ACCESS_KEY_ID:
-      - source: garagehq_aws_access_key_id
+        from_secret: garagehq_aws_access_key_id
-        target: AWS_ACCESS_KEY_ID
+      AWS_SECRET_ACCESS_KEY:
-      - source: garagehq_aws_secret_access_key
+        from_secret: garagehq_aws_secret_access_key
-        target: AWS_SECRET_ACCESS_KEY
     commands:
       - nix-shell --attr ci --run "to_s3"
 

Cargo.nix

@@ -25,6 +25,7 @@ args@{
   target ? null,
   codegenOpts ? null,
   profileOpts ? null,
+  cargoUnstableFlags ? null,
   rustcLinkFlags ? null,
   rustcBuildFlags ? null,
   mkRustCrate,
@@ -51,7 +52,7 @@ else let
   rootFeatures' = expandFeatures rootFeatures;
   overridableMkRustCrate = f:
     let
-      drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts rustcLinkFlags rustcBuildFlags; } // (f profileName)));
+      drvs = genDrvsByProfile profilesByName ({ profile, profileName }: mkRustCrate ({ inherit release profile hostPlatformCpu hostPlatformFeatures target profileOpts codegenOpts cargoUnstableFlags rustcLinkFlags rustcBuildFlags; } // (f profileName)));
     in { compileMode ? null, profileName ? decideProfile compileMode release }:
       let drv = drvs.${profileName}; in if compileMode == null then drv else drv.override { inherit compileMode; };
 in
@@ -1756,7 +1757,7 @@ in
     name = "format_table";
     version = "0.1.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/format-table");
+    src = fetchCrateLocal workspaceSrc;
   });
   
   "registry+https://github.com/rust-lang/crates.io-index".futures."0.3.30" = overridableMkRustCrate (profileName: rec {
@@ -1914,7 +1915,7 @@ in
     name = "garage";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/garage");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/bundled-libs" || rootFeatures' ? "garage/default") "bundled-libs")
       (lib.optional (rootFeatures' ? "garage/consul-discovery") "consul-discovery")
@@ -1992,7 +1993,7 @@ in
     name = "garage_api";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/api");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v") "k2v")
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/metrics" || rootFeatures' ? "garage_api/metrics") "metrics")
@@ -2056,7 +2057,7 @@ in
     name = "garage_block";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/block");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/system-libs" || rootFeatures' ? "garage_block/system-libs") "system-libs")
     ];
@@ -2089,7 +2090,7 @@ in
     name = "garage_db";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/db");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/bundled-libs" || rootFeatures' ? "garage/default" || rootFeatures' ? "garage_db/bundled-libs") "bundled-libs")
       (lib.optional (rootFeatures' ? "garage_db/default") "default")
@@ -2118,7 +2119,7 @@ in
     name = "garage_model";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/model");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage_model/default") "default")
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v" || rootFeatures' ? "garage_model/k2v") "k2v")
@@ -2157,7 +2158,7 @@ in
     name = "garage_net";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/net");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       [ "default" ]
       (lib.optional (rootFeatures' ? "garage_net/opentelemetry" || rootFeatures' ? "garage_net/telemetry") "opentelemetry")
@@ -2194,7 +2195,7 @@ in
     name = "garage_rpc";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/rpc");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery") "consul-discovery")
       (lib.optional (rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery" || rootFeatures' ? "garage_rpc/err-derive") "err-derive")
@@ -2243,7 +2244,7 @@ in
     name = "garage_table";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/table");
+    src = fetchCrateLocal workspaceSrc;
     dependencies = {
       arc_swap = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.6.0" { inherit profileName; }).out;
       async_trait = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.77" { profileName = "__noProfile"; }).out;
@@ -2268,7 +2269,7 @@ in
     name = "garage_util";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/util");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api/k2v" || rootFeatures' ? "garage_model/k2v" || rootFeatures' ? "garage_util/k2v") "k2v")
     ];
@@ -2312,7 +2313,7 @@ in
     name = "garage_web";
     version = "1.0.1";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/web");
+    src = fetchCrateLocal workspaceSrc;
     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;
@@ -3148,7 +3149,7 @@ in
     name = "k2v-client";
     version = "0.0.4";
     registry = "unknown";
-    src = fetchCrateLocal (workspaceSrc + "/src/k2v-client");
+    src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "k2v-client/clap" || rootFeatures' ? "k2v-client/cli") "clap")
       (lib.optional (rootFeatures' ? "k2v-client/cli") "cli")

Cargo.toml

@@ -61,7 +61,6 @@ md-5 = "0.10"
 mktemp = "0.5"
 nix = { version = "0.27", default-features = false, features = ["fs"] }
 nom = "7.1"
-num_cpus = "1.0"
 parse_duration = "2.1"
 pin-project = "1.0.12"
 pnet_datalink = "0.34"
@@ -86,7 +85,6 @@ heed = { version = "0.11", default-features = false, features = ["lmdb"] }
 rusqlite = "0.31.0"
 r2d2 = "0.8"
 r2d2_sqlite = "0.24"
-rocksdb = { version = "0.22", features = ["multi-threaded-cf"] }
 
 async-compression = { version = "0.4", features = ["tokio", "zstd"] }
 zstd = { version = "0.13", default-features = false }

default.nix

@@ -45,11 +45,4 @@ in {
       ];
     });
   };
-  clippy = {
-    amd64 = (compile {
-      inherit system git_version pkgsSrc cargo2nixOverlay;
-      target = "x86_64-unknown-linux-musl";
-      compiler = "clippy";
-    }).workspace.garage { compileMode = "build"; };
-  };
 }

doc/book/quick-start/_index.md

@@ -199,7 +199,7 @@ For instance here you could write just `garage layout assign -z dc1 -c 1G 563e`.
 The layout then has to be applied to the cluster, using:
 
 ```bash
-garage layout apply
+garage layout apply --version 1
 ```
 
 
@@ -349,7 +349,7 @@ Check [our s3 compatibility list](@/documentation/reference-manual/s3-compatibil
 
 ### Other tools for interacting with Garage
 
-The following tools can also be used to send and recieve files from/to Garage:
+The following tools can also be used to send and receive files from/to Garage:
 
 - [minio-client](@/documentation/connect/cli.md#minio-client) 
 - [s3cmd](@/documentation/connect/cli.md#s3cmd) 

doc/book/reference-manual/configuration.md

@@ -16,6 +16,7 @@ data_dir = "/var/lib/garage/data"
 metadata_fsync = true
 data_fsync = false
 disable_scrub = false
+use_local_tz = false
 metadata_auto_snapshot_interval = "6h"
 
 db_engine = "lmdb"
@@ -99,6 +100,7 @@ Top-level configuration options:
 [`data_fsync`](#data_fsync),
 [`db_engine`](#db_engine),
 [`disable_scrub`](#disable_scrub),
+[`use_local_tz`](#use_local_tz),
 [`lmdb_map_size`](#lmdb_map_size),
 [`metadata_auto_snapshot_interval`](#metadata_auto_snapshot_interval),
 [`metadata_dir`](#metadata_dir),
@@ -427,6 +429,13 @@ you should delete it from the data directory and then call `garage repair
 blocks` on the node to ensure that it re-obtains a copy from another node on
 the network.
 
+#### `use_local_tz` {#use_local_tz}
+
+By default, Garage runs the lifecycle worker every day at midnight in UTC. Set the
+`use_local_tz` configuration value to `true` if you want Garage to run the
+lifecycle worker at midnight in your local timezone. If you have multiple nodes,
+you should also ensure that each node has the same timezone configuration.
+
 #### `block_size` {#block_size}
 
 Garage splits stored objects in consecutive chunks of size `block_size`

doc/book/reference-manual/features.md

@@ -61,7 +61,7 @@ directed to a Garage cluster can be handled independently of one another instead
 of going through a central bottleneck (the leader node).
 As a consequence, requests can be handled much faster, even in cases where latency
 between cluster nodes is important (see our [benchmarks](@/documentation/design/benchmarks/index.md) for data on this).
-This is particularly usefull when nodes are far from one another and talk to one other through standard Internet connections.
+This is particularly useful when nodes are far from one another and talk to one other through standard Internet connections.
 
 ### Web server for static websites
 

doc/book/reference-manual/monitoring.md

@@ -392,7 +392,7 @@ table_merkle_updater_todo_queue_length{table_name="block_ref"} 0
 
 #### `table_sync_items_received`, `table_sync_items_sent` (counters)
 
-Number of data items sent to/recieved from other nodes during resync procedures
+Number of data items sent to/received from other nodes during resync procedures
 
 ```
 table_sync_items_received{from="<remote node>",table_name="bucket_v2"} 3

doc/book/working-documents/design-draft.md

@@ -42,7 +42,7 @@ The general principle are similar, but details have not been updated.**
 A version is defined by the existence of at least one entry in the blocks table for a certain version UUID.
 We must keep the following invariant: if a version exists in the blocks table, it has to be referenced in the objects table.
 We explicitly manage concurrent versions of an object: the version timestamp and version UUID columns are index columns, thus we may have several concurrent versions of an object.
-Important: before deleting an older version from the objects table, we must make sure that we did a successfull delete of the blocks of that version from the blocks table.
+Important: before deleting an older version from the objects table, we must make sure that we did a successful delete of the blocks of that version from the blocks table.
 
 Thus, the workflow for reading an object is as follows:
 
@@ -95,7 +95,7 @@ Known issue: if someone is reading from a version that we want to delete and the
 Usefull metadata:
 
 - list of versions that reference this block in the Casandra table, so that we can do GC by checking in Cassandra that the lines still exist
-- list of other nodes that we know have acknowledged a write of this block, usefull in the rebalancing algorithm
+- list of other nodes that we know have acknowledged a write of this block, useful in the rebalancing algorithm
 
 Write strategy: have a single thread that does all write IO so that it is serialized (or have several threads that manage independent parts of the hash space). When writing a blob, write it to a temporary file, close, then rename so that a concurrent read gets a consistent result (either not found or found with whole content).
 

doc/book/working-documents/migration-04.md

@@ -68,7 +68,7 @@ The migration steps are as follows:
 5. Turn off Garage 0.3
 
 6. Backup metadata folders if you can (i.e. if you have space to do it
-   somewhere). Backuping data folders could also be usefull but that's much
+   somewhere). Backuping data folders could also be useful but that's much
    harder to do. If your filesystem supports snapshots, this could be a good
    time to use them.
 

doc/book/working-documents/testing-strategy.md

@@ -37,7 +37,7 @@ There are two reasons for this:
 
 Reminder: rules of simplicity, concerning changes to Garage's source code.
 Always question what we are doing.
-Never do anything just because it looks nice or because we "think" it might be usefull at some later point but without knowing precisely why/when.
+Never do anything just because it looks nice or because we "think" it might be useful at some later point but without knowing precisely why/when.
 Only do things that make perfect sense in the context of what we currently know.
 
 ## References

doc/drafts/k2v-spec.md

@@ -562,7 +562,7 @@ token>", v: ["<value1>", ...] }`, with the following fields:
 - in case of concurrent update and deletion, a `null` is added to the list of concurrent values
 
 - if the `tombstones` query parameter is set to `true`, tombstones are returned
-  for items that have been deleted (this can be usefull for inserting after an
+  for items that have been deleted (this can be useful for inserting after an
   item that has been deleted, so that the insert is not considered
   concurrent with the delete). Tombstones are returned as tuples in the
   same format with only `null` values

flake.lock

@@ -12,17 +12,17 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1666087781,
+        "lastModified": 1705129117,
-        "narHash": "sha256-trKVdjMZ8mNkGfLcY5LsJJGtdV3xJDZnMVrkFjErlcs=",
+        "narHash": "sha256-LgdDHibvimzYhxBK3kxCk2gAL7k4Hyigl5KI0X9cijA=",
-        "owner": "Alexis211",
+        "owner": "cargo2nix",
         "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
+        "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59",
         "type": "github"
       },
       "original": {
-        "owner": "Alexis211",
+        "owner": "cargo2nix",
         "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
+        "rev": "ae19a9e1f8f0880c088ea155ab66cee1fa001f59",
         "type": "github"
       }
     },
@@ -58,33 +58,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724395761,
+        "lastModified": 1736692550,
-        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
+        "narHash": "sha256-7tk8xH+g0sJkKLTJFOxphJxxOjMDFMWv24nXslaU2ro=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
+        "rev": "7c4869c47090dd7f9f1bdfb49a22aea026996815",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1724681257,
-        "narHash": "sha256-EJRuc5Qp7yfXko5ZNeEMYAs4DzAvkCyALuJ/tGllhN4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0239aeb2f82ea27ccd6b61582b8f7fb8750eeada",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0239aeb2f82ea27ccd6b61582b8f7fb8750eeada",
+        "rev": "7c4869c47090dd7f9f1bdfb49a22aea026996815",
         "type": "github"
       }
     },
@@ -96,24 +80,28 @@
           "cargo2nix",
           "flake-utils"
         ],
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "cargo2nix",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1724638882,
+        "lastModified": 1736649126,
-        "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=",
+        "narHash": "sha256-XCw5sv/ePsroqiF3lJM6Y2X9EhPdHeE47gr3Q8b0UQw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
+        "rev": "162ab0edc2936508470199b2e8e6c444a2535019",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
         "repo": "rust-overlay",
+        "rev": "162ab0edc2936508470199b2e8e6c444a2535019",
         "type": "github"
       }
     }

flake.nix

@@ -2,24 +2,27 @@
   description =
     "Garage, an S3-compatible distributed object store for self-hosted deployments";
 
-  # Nixpkgs 24.05 as of 2024-08-26 has rustc v1.77
+  # Nixpkgs 24.11 as of 2025-01-12 has rustc v1.82
   inputs.nixpkgs.url =
-    "github:NixOS/nixpkgs/0239aeb2f82ea27ccd6b61582b8f7fb8750eeada";
+    "github:NixOS/nixpkgs/7c4869c47090dd7f9f1bdfb49a22aea026996815";
 
   inputs.flake-compat.url = "github:nix-community/flake-compat";
 
   inputs.cargo2nix = {
     # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
-    url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
+    #url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
 
     # As of 2023-04-25:
     # - my two patches were merged into unstable (one for clippy and one to "fix" feature detection)
     # - rustc v1.66
     # url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
 
-    # Rust overlay as of 2024-08-26
+    # Mainline cargo2nix as of of 2025-01-12 (branch release-0.11.0)
+    url = "github:cargo2nix/cargo2nix/ae19a9e1f8f0880c088ea155ab66cee1fa001f59";
+
+    # Rust overlay as of 2025-01-12
     inputs.rust-overlay.url =
-      "github:oxalica/rust-overlay/19b70f147b9c67a759e35824b241f1ed92e46694";
+      "github:oxalica/rust-overlay/162ab0edc2936508470199b2e8e6c444a2535019";
 
     inputs.nixpkgs.follows = "nixpkgs";
     inputs.flake-compat.follows = "flake-compat";

nix/compile.nix

@@ -1,4 +1,4 @@
-{ system, target ? null, pkgsSrc, cargo2nixOverlay, compiler ? "rustc"
+{ system, target ? null, pkgsSrc, cargo2nixOverlay
 , release ? false, git_version ? null, features ? null, }:
 
 let
@@ -20,24 +20,10 @@ let
     };
 
   toolchainOptions = {
-    rustVersion = "1.77.0";
+    rustVersion = "1.78.0";
     extraRustComponents = [ "clippy" ];
   };
 
-  buildEnv = (drv:
-    {
-      rustc = drv.setBuildEnv;
-      clippy = ''
-        ${drv.setBuildEnv or ""}
-        echo
-        echo --- BUILDING WITH CLIPPY ---
-        echo
-
-        export NIX_RUST_BUILD_FLAGS="''${NIX_RUST_BUILD_FLAGS} --deny warnings"
-        export RUSTC="''${CLIPPY_DRIVER}"
-      '';
-    }.${compiler});
-
   /* Cargo2nix provides many overrides by default, you can take inspiration from them:
      https://github.com/cargo2nix/cargo2nix/blob/master/overlay/overrides.nix
 
@@ -46,9 +32,7 @@ let
   */
   packageOverrides = pkgs:
     pkgs.rustBuilder.overrides.all ++ [
-      /* [1] We add some logic to compile our crates with clippy, it provides us many additional lints
+      /* [1] We need to alter Nix hardening to make static binaries: PIE,
-
-         [2] We need to alter Nix hardening to make static binaries: PIE,
          Position Independent Executables seems to be supported only on amd64. Having
          this flag set either 1. make our executables crash or 2. compile as dynamic on some platforms.
          Here, we deactivate it. Later (find `codegenOpts`), we reactivate it for supported targets
@@ -56,11 +40,11 @@ let
          PIE is a feature used by ASLR, which helps mitigate security issues.
          Learn more about Nix Hardening at: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/cc-wrapper/add-hardening.sh
 
-         [3] We want to inject the git version while keeping the build deterministic.
+         [2] We want to inject the git version while keeping the build deterministic.
          As we do not want to consider the .git folder as part of the input source,
          we ask the user (the CI often) to pass the value to Nix.
 
-         [4] We don't want libsodium-sys and zstd-sys to try to use pkgconfig to build against a system library.
+         [3] We don't want libsodium-sys and zstd-sys to try to use pkgconfig to build against a system library.
          However the features to do so get activated for some reason (due to a bug in cargo2nix?),
          so disable them manually here.
       */
@@ -68,7 +52,7 @@ let
         name = "garage";
         overrideAttrs = drv:
           (if git_version != null then {
-            # [3]
+            # [2]
             preConfigure = ''
               ${drv.preConfigure or ""}
               export GIT_VERSION="${git_version}"
@@ -76,86 +60,21 @@ let
           } else
             { }) // {
               # [1]
-              setBuildEnv = (buildEnv drv);
-              # [2]
               hardeningDisable = [ "pie" ];
             };
       })
 
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_rpc";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_db";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_util";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_table";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_block";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_model";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_api";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "garage_web";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
-      (pkgs.rustBuilder.rustLib.makeOverride {
-        name = "k2v-client";
-        overrideAttrs = drv: { # [1]
-          setBuildEnv = (buildEnv drv);
-        };
-      })
-
       (pkgs.rustBuilder.rustLib.makeOverride {
         name = "libsodium-sys";
         overrideArgs = old: {
-          features = [ ]; # [4]
+          features = [ ]; # [3]
         };
       })
 
       (pkgs.rustBuilder.rustLib.makeOverride {
         name = "zstd-sys";
         overrideArgs = old: {
-          features = [ ]; # [4]
+          features = [ ]; # [3]
         };
       })
     ];

script/helm/garage/Chart.yaml

@@ -15,7 +15,7 @@ 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.1
+version: 0.6.0
 
 # 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

script/helm/garage/README.md

@@ -0,0 +1,86 @@
+# garage
+
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.1](https://img.shields.io/badge/AppVersion-v1.0.1-informational?style=flat-square)
+
+S3-compatible object store for small self-hosted geo-distributed deployments
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| deployment.kind | string | `"StatefulSet"` | Switchable to DaemonSet |
+| deployment.podManagementPolicy | string | `"OrderedReady"` | If using statefulset, allow Parallel or OrderedReady (default) |
+| deployment.replicaCount | int | `3` | Number of StatefulSet replicas/garage nodes to start |
+| environment | object | `{}` |  |
+| extraVolumeMounts | object | `{}` |  |
+| extraVolumes | object | `{}` |  |
+| fullnameOverride | string | `""` |  |
+| garage.blockSize | string | `"1048576"` | Defaults is 1MB An increase can result in better performance in certain scenarios https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#block-size |
+| garage.bootstrapPeers | list | `[]` | This is not required if you use the integrated kubernetes discovery |
+| garage.compressionLevel | string | `"1"` | zstd compression level of stored blocks https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#compression-level |
+| garage.dbEngine | string | `"lmdb"` | Can be changed for better performance on certain systems https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#db-engine-since-v0-8-0 |
+| garage.existingConfigMap | string | `""` | if not empty string, allow using an existing ConfigMap for the garage.toml, if set, ignores garage.toml |
+| garage.garageTomlString | string | `""` | String Template for the garage configuration if set, ignores above values. Values can be templated, see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/ |
+| garage.kubernetesSkipCrd | bool | `false` | Set to true if you want to use k8s discovery but install the CRDs manually outside of the helm chart, for example if you operate at namespace level without cluster ressources |
+| garage.replicationMode | string | `"3"` | Default to 3 replicas, see the replication_mode section at https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication-mode |
+| garage.rpcBindAddr | string | `"[::]:3901"` |  |
+| garage.rpcSecret | string | `""` | If not given, a random secret will be generated and stored in a Secret object |
+| garage.s3.api.region | string | `"garage"` |  |
+| garage.s3.api.rootDomain | string | `".s3.garage.tld"` |  |
+| garage.s3.web.index | string | `"index.html"` |  |
+| garage.s3.web.rootDomain | string | `".web.garage.tld"` |  |
+| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.repository | string | `"dxflrs/amd64_garage"` | default to amd64 docker image |
+| image.tag | string | `""` | set the image tag, please prefer using the chart version and not this to avoid compatibility issues |
+| imagePullSecrets | list | `[]` | set if you need credentials to pull your custom image |
+| ingress.s3.api.annotations | object | `{}` | Rely _either_ on the className or the annotation below but not both! If you want to use the className, set className: "nginx" and replace "nginx" by an Ingress controller name, examples [here](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers). |
+| ingress.s3.api.enabled | bool | `false` |  |
+| ingress.s3.api.hosts[0] | object | `{"host":"s3.garage.tld","paths":[{"path":"/","pathType":"Prefix"}]}` | garage S3 API endpoint, to be used with awscli for example |
+| ingress.s3.api.hosts[1] | object | `{"host":"*.s3.garage.tld","paths":[{"path":"/","pathType":"Prefix"}]}` | garage S3 API endpoint, DNS style bucket access |
+| ingress.s3.api.labels | object | `{}` |  |
+| ingress.s3.api.tls | list | `[]` |  |
+| ingress.s3.web.annotations | object | `{}` | Rely _either_ on the className or the annotation below but not both! If you want to use the className, set className: "nginx" and replace "nginx" by an Ingress controller name, examples [here](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers). |
+| ingress.s3.web.enabled | bool | `false` |  |
+| ingress.s3.web.hosts[0] | object | `{"host":"*.web.garage.tld","paths":[{"path":"/","pathType":"Prefix"}]}` | wildcard website access with bucket name prefix |
+| ingress.s3.web.hosts[1] | object | `{"host":"mywebpage.example.com","paths":[{"path":"/","pathType":"Prefix"}]}` | specific bucket access with FQDN bucket |
+| ingress.s3.web.labels | object | `{}` |  |
+| ingress.s3.web.tls | list | `[]` |  |
+| initImage.pullPolicy | string | `"IfNotPresent"` |  |
+| initImage.repository | string | `"busybox"` |  |
+| initImage.tag | string | `"stable"` |  |
+| monitoring.metrics.enabled | bool | `false` | If true, a service for monitoring is created with a prometheus.io/scrape annotation |
+| monitoring.metrics.serviceMonitor.enabled | bool | `false` | If true, a ServiceMonitor CRD is created for a prometheus operator https://github.com/coreos/prometheus-operator |
+| monitoring.metrics.serviceMonitor.interval | string | `"15s"` |  |
+| monitoring.metrics.serviceMonitor.labels | object | `{}` |  |
+| monitoring.metrics.serviceMonitor.path | string | `"/metrics"` |  |
+| monitoring.metrics.serviceMonitor.relabelings | list | `[]` |  |
+| monitoring.metrics.serviceMonitor.scheme | string | `"http"` |  |
+| monitoring.metrics.serviceMonitor.scrapeTimeout | string | `"10s"` |  |
+| monitoring.metrics.serviceMonitor.tlsConfig | object | `{}` |  |
+| monitoring.tracing.sink | string | `""` | specify a sink endpoint for OpenTelemetry Traces, eg. `http://localhost:4317` |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| persistence.data.hostPath | string | `"/var/lib/garage/data"` |  |
+| persistence.data.size | string | `"100Mi"` |  |
+| persistence.enabled | bool | `true` |  |
+| persistence.meta.hostPath | string | `"/var/lib/garage/meta"` |  |
+| persistence.meta.size | string | `"100Mi"` |  |
+| podAnnotations | object | `{}` | additonal pod annotations |
+| podSecurityContext.fsGroup | int | `1000` |  |
+| podSecurityContext.runAsGroup | int | `1000` |  |
+| podSecurityContext.runAsNonRoot | bool | `true` |  |
+| podSecurityContext.runAsUser | int | `1000` |  |
+| resources | object | `{}` |  |
+| securityContext.capabilities | object | `{"drop":["ALL"]}` | The default security context is heavily restricted, feel free to tune it to your requirements |
+| securityContext.readOnlyRootFilesystem | bool | `true` |  |
+| service.s3.api.port | int | `3900` |  |
+| service.s3.web.port | int | `3902` |  |
+| service.type | string | `"ClusterIP"` | You can rely on any service to expose your cluster - ClusterIP (+ Ingress) - NodePort (+ Ingress) - LoadBalancer |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| tolerations | list | `[]` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

script/helm/garage/templates/configmap.yaml

@@ -1,7 +1,49 @@
+{{- if not .Values.garage.existingConfigMap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "garage.fullname" . }}-config
 data:
   garage.toml: |-
-    {{- tpl (index (index .Values.garage) "garage.toml") $ | nindent 4 }}
+    {{- if .Values.garage.garageTomlString }}
+        {{- tpl (index (index .Values.garage) "garageTomlString") $ | nindent 4 }}
+    {{- else }}
+    metadata_dir = "/mnt/meta"
+    data_dir = "/mnt/data"
+
+    db_engine = "{{ .Values.garage.dbEngine }}"
+
+    block_size = {{ .Values.garage.blockSize }}
+
+    replication_mode = "{{ .Values.garage.replicationMode }}"
+
+    compression_level = {{ .Values.garage.compressionLevel }}
+
+    rpc_bind_addr = "{{ .Values.garage.rpcBindAddr }}"
+    # rpc_secret will be populated by the init container from a k8s secret object
+    rpc_secret = "__RPC_SECRET_REPLACE__"
+
+    bootstrap_peers = {{ .Values.garage.bootstrapPeers }}
+
+    [kubernetes_discovery]
+    namespace = "{{ .Release.Namespace }}"
+    service_name = "{{ include "garage.fullname" . }}"
+    skip_crd = {{ .Values.garage.kubernetesSkipCrd }}
+
+    [s3_api]
+    s3_region = "{{ .Values.garage.s3.api.region }}"
+    api_bind_addr = "[::]:3900"
+    root_domain = "{{ .Values.garage.s3.api.rootDomain }}"
+
+    [s3_web]
+    bind_addr = "[::]:3902"
+    root_domain = "{{ .Values.garage.s3.web.rootDomain }}"
+    index = "{{ .Values.garage.s3.web.index }}"
+
+    [admin]
+    api_bind_addr = "[::]:3903"
+    {{- if .Values.monitoring.tracing.sink }}
+    trace_sink = "{{ .Values.monitoring.tracing.sink }}"
+    {{- end }}
+    {{- end }}
+{{- end }}

script/helm/garage/values.yaml

@@ -4,28 +4,30 @@
 
 # Garage configuration. These values go to garage.toml
 garage:
-  # Can be changed for better performance on certain systems
+  # -- Can be changed for better performance on certain systems
   # https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#db-engine-since-v0-8-0
   dbEngine: "lmdb"
 
-  # Defaults is 1MB
+  # -- Defaults is 1MB
   # An increase can result in better performance in certain scenarios
   # https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#block-size
   blockSize: "1048576"
 
-  # Default to 3 replicas, see the replication_mode section at
+  # -- Default to 3 replicas, see the replication_mode section at
   # https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication-mode
   replicationMode: "3"
 
-  # zstd compression level of stored blocks
+  # -- zstd compression level of stored blocks
   # https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#compression-level
   compressionLevel: "1"
 
   rpcBindAddr: "[::]:3901"
-  # If not given, a random secret will be generated and stored in a Secret object
+  # -- If not given, a random secret will be generated and stored in a Secret object
   rpcSecret: ""
-  # This is not required if you use the integrated kubernetes discovery
+  # -- This is not required if you use the integrated kubernetes discovery
   bootstrapPeers: []
+  # -- Set to true if you want to use k8s discovery but install the CRDs manually outside
+  # of the helm chart, for example if you operate at namespace level without cluster ressources
   kubernetesSkipCrd: false
   s3:
     api:
@@ -34,47 +36,16 @@ garage:
     web:
       rootDomain: ".web.garage.tld"
       index: "index.html"
-  # Template for the garage configuration
-  # Values can be templated
-  # ref: https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/
-  garage.toml: |-
-    metadata_dir = "/mnt/meta"
-    data_dir = "/mnt/data"
 
-    db_engine = "{{ .Values.garage.dbEngine }}"
+  # -- if not empty string, allow using an existing ConfigMap for the garage.toml,
+  # if set, ignores garage.toml
+  existingConfigMap: ""
 
-    block_size = {{ .Values.garage.blockSize }}
+  # -- String Template for the garage configuration
-
+  # if set, ignores above values.
-    replication_mode = "{{ .Values.garage.replicationMode }}"
+  # Values can be templated,
-
+  # see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/
-    compression_level = {{ .Values.garage.compressionLevel }}
+  garageTomlString: ""
-
-    rpc_bind_addr = "{{ .Values.garage.rpcBindAddr }}"
-    # rpc_secret will be populated by the init container from a k8s secret object
-    rpc_secret = "__RPC_SECRET_REPLACE__"
-
-    bootstrap_peers = {{ .Values.garage.bootstrapPeers }}
-
-    [kubernetes_discovery]
-    namespace = "{{ .Release.Namespace }}"
-    service_name = "{{ include "garage.fullname" . }}"
-    skip_crd = {{ .Values.garage.kubernetesSkipCrd }}
-
-    [s3_api]
-    s3_region = "{{ .Values.garage.s3.api.region }}"
-    api_bind_addr = "[::]:3900"
-    root_domain = "{{ .Values.garage.s3.api.rootDomain }}"
-
-    [s3_web]
-    bind_addr = "[::]:3902"
-    root_domain = "{{ .Values.garage.s3.web.rootDomain }}"
-    index = "{{ .Values.garage.s3.web.index }}"
-
-    [admin]
-    api_bind_addr = "[::]:3903"
-    {{- if .Values.monitoring.tracing.sink }}
-    trace_sink = "{{ .Values.monitoring.tracing.sink }}"
-    {{- end }}
 
 # Data persistence
 persistence:
@@ -92,16 +63,18 @@ persistence:
 
 # Deployment configuration
 deployment:
-  # Switchable to DaemonSet
+  # -- Switchable to DaemonSet
   kind: StatefulSet
-  # Number of StatefulSet replicas/garage nodes to start
+  # -- Number of StatefulSet replicas/garage nodes to start
   replicaCount: 3
-  # If using statefulset, allow Parallel or OrderedReady (default)
+  # -- If using statefulset, allow Parallel or OrderedReady (default)
   podManagementPolicy: OrderedReady
 
 image:
+  # -- default to amd64 docker image
   repository: dxflrs/amd64_garage
-  # please prefer using the chart version and not this tag
+  # -- set the image tag, please prefer using the chart version and not this
+  # to avoid compatibility issues
   tag: ""
   pullPolicy: IfNotPresent
 
@@ -110,19 +83,21 @@ initImage:
   tag: stable
   pullPolicy: IfNotPresent
 
+# -- set if you need credentials to pull your custom image
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
 serviceAccount:
-  # Specifies whether a service account should be created
+  # -- Specifies whether a service account should be created
   create: true
-  # Annotations to add to the service account
+  # -- Annotations to add to the service account
   annotations: {}
-  # The name of the service account to use.
+  # -- The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+# -- additonal pod annotations
 podAnnotations: {}
 
 podSecurityContext:
@@ -132,7 +107,7 @@ podSecurityContext:
   runAsNonRoot: true
 
 securityContext:
-  # The default security context is heavily restricted
+  # -- The default security context is heavily restricted,
   # feel free to tune it to your requirements
   capabilities:
     drop:
@@ -140,7 +115,7 @@ securityContext:
   readOnlyRootFilesystem: true
 
 service:
-  # You can rely on any service to expose your cluster
+  # -- You can rely on any service to expose your cluster
   # - ClusterIP (+ Ingress)
   # - NodePort (+ Ingress)
   # - LoadBalancer
@@ -156,20 +131,23 @@ ingress:
   s3:
     api:
       enabled: false
-      # Rely either on the className or the annotation below but not both
+      # -- Rely _either_ on the className or the annotation below but not both!
-      # replace "nginx" by an Ingress controller
+      # If you want to use the className, set
-      # you can find examples here https://kubernetes.io/docs/concepts/services-networking/ingress-controllers
       # className: "nginx"
+      # and replace "nginx" by an Ingress controller name,
+      # examples [here](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers).
       annotations: {}
         # kubernetes.io/ingress.class: "nginx"
         # kubernetes.io/tls-acme: "true"
       labels: {}
       hosts:
-        - host: "s3.garage.tld" # garage S3 API endpoint
+        # -- garage S3 API endpoint, to be used with awscli for example
+        - host: "s3.garage.tld"
           paths:
             - path: /
               pathType: Prefix
-        - host: "*.s3.garage.tld" # garage S3 API endpoint, DNS style bucket access
+        # -- garage S3 API endpoint, DNS style bucket access
+        - host: "*.s3.garage.tld"
           paths:
             - path: /
               pathType: Prefix
@@ -179,20 +157,23 @@ ingress:
       #      - kubernetes.docker.internal
     web:
       enabled: false
-      # Rely either on the className or the annotation below but not both
+      # -- Rely _either_ on the className or the annotation below but not both!
-      # replace "nginx" by an Ingress controller
+      # If you want to use the className, set
-      # you can find examples here https://kubernetes.io/docs/concepts/services-networking/ingress-controllers
       # className: "nginx"
+      # and replace "nginx" by an Ingress controller name,
+      # examples [here](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers).
       annotations: {}
         # kubernetes.io/ingress.class: nginx
         # kubernetes.io/tls-acme: "true"
       labels: {}
       hosts:
-       - host: "*.web.garage.tld" # wildcard website access with bucket name prefix
+      # --  wildcard website access with bucket name prefix
+       - host: "*.web.garage.tld"
          paths:
            - path: /
              pathType: Prefix
-       - host: "mywebpage.example.com" # specific bucket access with FQDN bucket
+       # -- specific bucket access with FQDN bucket
+       - host: "mywebpage.example.com"
          paths:
            - path: /
              pathType: Prefix
@@ -224,10 +205,10 @@ extraVolumeMounts: {}
 
 monitoring:
   metrics:
-    # If true, a service for monitoring is created with a prometheus.io/scrape annotation
+    # -- If true, a service for monitoring is created with a prometheus.io/scrape annotation
     enabled: false
     serviceMonitor:
-      # If true, a ServiceMonitor CRD is created for a prometheus operator
+      # -- If true, a ServiceMonitor CRD is created for a prometheus operator
       # https://github.com/coreos/prometheus-operator
       enabled: false
       path: /metrics
@@ -239,4 +220,5 @@ monitoring:
       scrapeTimeout: 10s
       relabelings: []
   tracing:
+    # -- specify a sink endpoint for OpenTelemetry Traces, eg. `http://localhost:4317`
     sink: ""

shell.nix

@@ -115,7 +115,7 @@ in
     shellHook = ''
       function refresh_cache {
         pass show deuxfleurs/nix_priv_key > /tmp/nix-signing-key.sec
-        for attr in clippy.amd64 test.amd64 pkgs.{amd64,i386,arm,arm64}.release; do
+        for attr in pkgs.amd64.debug test.amd64 pkgs.{amd64,i386,arm,arm64}.release; do
           echo "Updating cache for ''${attr}"
           nix copy -j8 \
             --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/tmp/nix-signing-key.sec' \

src/api/k2v/api_server.rs

@@ -77,7 +77,7 @@ impl ApiHandler for K2VApiServer {
 		} = endpoint;
 		let garage = self.garage.clone();
 
-		// The OPTIONS method is procesed early, before we even check for an API key
+		// The OPTIONS method is processed early, before we even check for an API key
 		if let Endpoint::Options = endpoint {
 			let options_res = handle_options_api(garage, &req, Some(bucket_name))
 				.await

src/api/router_macros.rs

@@ -204,7 +204,7 @@ macro_rules! generateQueryParameters {
             }
 
             /// Get an error message in case not all parameters where used when extracting them to
-            /// build an Enpoint variant
+            /// build an Endpoint variant
             fn nonempty_message(&self) -> Option<&str> {
                 if self.keyword.is_some() {
                     Some("Keyword not used")

src/api/s3/checksum.rs

@@ -340,8 +340,8 @@ pub(crate) fn request_checksum_value(
 	Ok(ret.pop())
 }
 
-/// Checks for the presense of x-amz-checksum-algorithm
+/// Checks for the presence of x-amz-checksum-algorithm
-/// if so extract the corrseponding x-amz-checksum-* value
+/// if so extract the corresponding x-amz-checksum-* value
 pub(crate) fn request_checksum_algorithm_value(
 	headers: &HeaderMap<HeaderValue>,
 ) -> Result<Option<ChecksumValue>, Error> {

src/api/s3/copy.rs

@@ -63,7 +63,7 @@ pub async fn handle_copy(
 	let source_checksum_algorithm = source_checksum.map(|x| x.algorithm());
 
 	// If source object has a checksum, the destination object must as well.
-	// The x-amz-checksum-algorihtm header allows to change that algorithm,
+	// The x-amz-checksum-algorithm header allows to change that algorithm,
 	// but if it is absent, we must use the same as before
 	let checksum_algorithm = checksum_algorithm.or(source_checksum_algorithm);
 

src/api/s3/list.rs

@@ -398,7 +398,7 @@ enum ExtractionResult {
 		key: String,
 	},
 	// Fallback key is used for legacy APIs that only support
-	// exlusive pagination (and not inclusive one).
+	// exclusive pagination (and not inclusive one).
 	SkipTo {
 		key: String,
 		fallback_key: Option<String>,
@@ -408,7 +408,7 @@ enum ExtractionResult {
 #[derive(PartialEq, Clone, Debug)]
 enum RangeBegin {
 	// Fallback key is used for legacy APIs that only support
-	// exlusive pagination (and not inclusive one).
+	// exclusive pagination (and not inclusive one).
 	IncludingKey {
 		key: String,
 		fallback_key: Option<String>,

src/api/s3/post_object.rs

@@ -213,7 +213,7 @@ pub async fn handle_post_object(
 	}
 
 	// if we ever start supporting ACLs, we likely want to map "acl" to x-amz-acl" somewhere
-	// arround here to make sure the rest of the machinery takes our acl into account.
+	// around here to make sure the rest of the machinery takes our acl into account.
 	let headers = get_headers(&params)?;
 
 	let expected_checksums = ExpectedChecksums {

src/api/s3/website.rs

@@ -276,7 +276,7 @@ impl Redirect {
 				return Err(Error::bad_request("Bad XML: invalid protocol"));
 			}
 		}
-		// TODO there are probably more invalide cases, but which ones?
+		// TODO there are probably more invalid cases, but which ones?
 		Ok(())
 	}
 }

src/api/signature/payload.rs

@@ -47,8 +47,8 @@ pub async fn check_payload_signature(
 	let query = parse_query_map(request.uri())?;
 
 	if query.contains_key(&X_AMZ_ALGORITHM) {
-		// We check for presigned-URL-style authentification first, because
+		// We check for presigned-URL-style authentication first, because
-		// the browser or someting else could inject an Authorization header
+		// the browser or something else could inject an Authorization header
 		// that is totally unrelated to AWS signatures.
 		check_presigned_signature(garage, service, request, query).await
 	} else if request.headers().contains_key(AUTHORIZATION) {
@@ -132,7 +132,7 @@ async fn check_presigned_signature(
 	let authorization = Authorization::parse_presigned(&algorithm.value, &query)?;
 
 	// Verify that all necessary request headers are included in signed_headers
-	// For AWSv4 pre-signed URLs, the following must be incldued:
+	// For AWSv4 pre-signed URLs, the following must be included:
 	// - the Host header (mandatory)
 	// - all x-amz-* headers used in the request
 	let signed_headers = split_signed_headers(&authorization)?;
@@ -306,7 +306,7 @@ pub fn canonical_request(
 	// Note that there is also the issue of path normalization, which I hope is unrelated to the
 	// one of URI-encoding. At least in aws-sigv4 both parameters can be set independently,
 	// and rusoto_signature does not seem to do any effective path normalization, even though
-	// it mentions it in the comments (same link to the souce code as above).
+	// it mentions it in the comments (same link to the source code as above).
 	// We make the explicit choice of NOT normalizing paths in the K2V API because doing so
 	// would make non-normalized paths invalid K2V partition keys, and we don't want that.
 	let canonical_uri: std::borrow::Cow<str> = if service != "s3" {

src/block/layout.rs

@@ -279,7 +279,8 @@ impl DataLayout {
 		u16::from_be_bytes([
 			hash.as_slice()[HASH_DRIVE_BYTES.0],
 			hash.as_slice()[HASH_DRIVE_BYTES.1],
-		]) as usize % DRIVE_NPART
+		]) as usize
+			% DRIVE_NPART
 	}
 
 	fn block_dir_from(&self, hash: &Hash, dir: &PathBuf) -> PathBuf {

src/block/resync.rs

@@ -105,7 +105,7 @@ impl BlockResyncManager {
 		}
 	}
 
-	/// Get lenght of resync queue
+	/// Get length of resync queue
 	pub fn queue_len(&self) -> Result<usize, Error> {
 		Ok(self.queue.len()?)
 	}
@@ -185,10 +185,10 @@ impl BlockResyncManager {
 	//
 	// - resync.errors: a tree that indicates for each block
 	//   if the last resync resulted in an error, and if so,
-	//   the following two informations (see the ErrorCounter struct):
+	//   the following two information (see the ErrorCounter struct):
 	//   - how many consecutive resync errors for this block?
 	//   - when was the last try?
-	//   These two informations are used to implement an
+	//   These two information are used to implement an
 	//   exponential backoff retry strategy.
 	//   The key in this tree is the 32-byte hash of the block,
 	//   and the value is the encoded ErrorCounter value.

src/db/Cargo.toml

@@ -15,14 +15,11 @@ path = "lib.rs"
 err-derive.workspace = true
 hexdump.workspace = true
 tracing.workspace = true
-opentelemetry.workspace = true
 
 heed = { workspace = true, optional = true }
 rusqlite = { workspace = true, optional = true, features = ["backup"] }
 r2d2 = { workspace = true, optional = true }
 r2d2_sqlite = { workspace = true, optional = true }
-rocksdb = { workspace = true, optional = true }
-num_cpus = { workspace = true, optional = true }
 
 [dev-dependencies]
 mktemp.workspace = true
@@ -32,4 +29,3 @@ default = [ "lmdb", "sqlite" ]
 bundled-libs = [ "rusqlite?/bundled" ]
 lmdb = [ "heed" ]
 sqlite = [ "rusqlite", "r2d2", "r2d2_sqlite" ]
-rocksdb = [ "dep:rocksdb", "dep:num_cpus" ]

src/db/lib.rs

@@ -5,10 +5,6 @@ extern crate tracing;
 pub mod lmdb_adapter;
 #[cfg(feature = "sqlite")]
 pub mod sqlite_adapter;
-#[cfg(feature = "rocksdb")]
-pub mod rocksdb_adapter;
-#[cfg(feature = "rocksdb")]
-pub mod metric_proxy;
 
 pub mod open;
 
@@ -126,7 +122,7 @@ impl Db {
 				_ => unreachable!(),
 			},
 			Err(TxError::Db(e2)) => match ret {
-				// Ok was stored -> the error occured when finalizing
+				// Ok was stored -> the error occurred when finalizing
 				// transaction
 				Ok(_) => Err(TxError::Db(e2)),
 				// An error was already stored: that's the one we want to

src/db/lmdb_adapter.rs

@@ -233,7 +233,7 @@ impl<'a> LmdbTx<'a> {
 	fn get_tree(&self, i: usize) -> TxOpResult<&Database> {
 		self.trees.get(i).ok_or_else(|| {
 			TxOpError(Error(
-				"invalid tree id (it might have been openned after the transaction started)".into(),
+				"invalid tree id (it might have been opened after the transaction started)".into(),
 			))
 		})
 	}

src/db/metric_proxy.rs

@@ -1,217 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::time::Instant;
-
-use crate::rocksdb_adapter::RocksDb;
-use crate::{
-	Bound, Db, IDb, ITx, ITxFn, OnCommit, Result, TxFnResult, TxOpResult, TxResult, TxValueIter,
-	Value, ValueIter,
-};
-use opentelemetry::{
-	global,
-	metrics::{Unit, ValueRecorder},
-	KeyValue,
-};
-
-pub struct MetricDbProxy {
-	//@FIXME Replace with a template
-	db: RocksDb,
-	op: ValueRecorder<f64>,
-}
-
-impl MetricDbProxy {
-	pub fn init(db: RocksDb) -> Db {
-		let meter = global::meter("garage/db");
-		let s = Self {
-			db,
-			op: meter
-				.f64_value_recorder("db.op")
-				.with_description("Duration and amount of operations on the local metadata engine")
-				.with_unit(Unit::new("ms"))
-				.init(),
-		};
-		Db(Arc::new(s))
-	}
-
-	fn instrument<T>(
-		&self,
-		fx: impl FnOnce() -> T,
-		op: &'static str,
-		cat: &'static str,
-		tx: &'static str,
-	) -> T {
-		let metric_tags = [
-			KeyValue::new("op", op),
-			KeyValue::new("cat", cat),
-			KeyValue::new("tx", tx),
-		];
-
-		let request_start = Instant::now();
-		let res = fx();
-		let delay_nanos = Instant::now()
-			.saturating_duration_since(request_start)
-			.as_nanos();
-		let delay_millis: f64 = delay_nanos as f64 / 1_000_000f64;
-		self.op.record(delay_millis, &metric_tags);
-
-		res
-	}
-}
-
-impl IDb for MetricDbProxy {
-	fn engine(&self) -> String {
-		format!("Metric Proxy on {}", self.db.engine())
-	}
-
-	fn open_tree(&self, name: &str) -> Result<usize> {
-		self.instrument(|| self.db.open_tree(name), "open_tree", "control", "no")
-	}
-
-	fn list_trees(&self) -> Result<Vec<String>> {
-		self.instrument(|| self.db.list_trees(), "list_trees", "control", "no")
-	}
-
-	fn snapshot(&self, to: &PathBuf) -> Result<()> {
-		self.instrument(|| self.db.snapshot(to), "snapshot", "control", "no")
-	}
-
-	// ---
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-		self.instrument(|| self.db.get(tree, key), "get", "data", "no")
-	}
-
-	fn len(&self, tree: usize) -> Result<usize> {
-		self.instrument(|| self.db.len(tree), "len", "data", "no")
-	}
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<()> {
-		self.instrument(|| self.db.insert(tree, key, value), "insert", "data", "no")
-	}
-
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<()> {
-		self.instrument(|| self.db.remove(tree, key), "remove", "data", "no")
-	}
-
-	fn clear(&self, tree: usize) -> Result<()> {
-		self.instrument(|| self.db.clear(tree), "clear", "data", "no")
-	}
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>> {
-		self.instrument(|| self.db.iter(tree), "iter", "data", "no")
-	}
-
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>> {
-		self.instrument(|| self.db.iter_rev(tree), "iter_rev", "data", "no")
-	}
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		self.instrument(|| self.db.range(tree, low, high), "range", "data", "no")
-	}
-
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-		self.instrument(
-			|| self.db.range_rev(tree, low, high),
-			"range_rev",
-			"data",
-			"no",
-		)
-	}
-
-	// ----
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<OnCommit, ()> {
-		self.instrument(
-			|| self.db.transaction(&MetricITxFnProxy { f, metrics: self }),
-			"transaction",
-			"control",
-			"yes",
-		)
-	}
-}
-
-struct MetricITxFnProxy<'a> {
-	f: &'a dyn ITxFn,
-	metrics: &'a MetricDbProxy,
-}
-impl<'a> ITxFn for MetricITxFnProxy<'a> {
-	fn try_on(&self, tx: &mut dyn ITx) -> TxFnResult {
-		self.f.try_on(&mut MetricTxProxy {
-			tx,
-			metrics: self.metrics,
-		})
-	}
-}
-
-struct MetricTxProxy<'a> {
-	tx: &'a mut dyn ITx,
-	metrics: &'a MetricDbProxy,
-}
-impl<'a> ITx for MetricTxProxy<'a> {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-		self.metrics
-			.instrument(|| self.tx.get(tree, key), "get", "data", "yes")
-	}
-
-	fn len(&self, tree: usize) -> TxOpResult<usize> {
-		self.metrics
-			.instrument(|| self.tx.len(tree), "len", "data", "yes")
-	}
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<()> {
-		self.metrics
-			.instrument(|| self.tx.insert(tree, key, value), "insert", "data", "yes")
-	}
-
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<()> {
-		self.metrics
-			.instrument(|| self.tx.remove(tree, key), "remove", "data", "yes")
-	}
-
-	fn clear(&mut self, tree: usize) -> TxOpResult<()> {
-		self.metrics
-			.instrument(|| self.tx.clear(tree), "clear", "data", "yes")
-	}
-
-	fn iter(&self, tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		self.metrics
-			.instrument(|| self.tx.iter(tree), "iter", "data", "yes")
-	}
-	fn iter_rev(&self, tree: usize) -> TxOpResult<TxValueIter<'_>> {
-		self.metrics
-			.instrument(|| self.tx.iter_rev(tree), "iter_rev", "data", "yes")
-	}
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		self.metrics
-			.instrument(|| self.tx.range(tree, low, high), "range", "data", "yes")
-	}
-
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-		self.metrics.instrument(
-			|| self.tx.range_rev(tree, low, high),
-			"range_rev",
-			"data",
-			"yes",
-		)
-	}
-}

src/db/open.rs

@@ -11,8 +11,6 @@ use crate::{Db, Error, Result};
 pub enum Engine {
 	Lmdb,
 	Sqlite,
-    RocksDb,
-    RocksDbWithMetrics,
 }
 
 impl Engine {
@@ -21,8 +19,6 @@ impl Engine {
 		match self {
 			Self::Lmdb => "lmdb",
 			Self::Sqlite => "sqlite",
-            Self::RocksDb => "rocksdb",
-            Self::RocksDbWithMetrics => "rocksdb-with-metrics",
 		}
 	}
 }
@@ -40,8 +36,6 @@ impl std::str::FromStr for Engine {
 		match text {
 			"lmdb" | "heed" => Ok(Self::Lmdb),
 			"sqlite" | "sqlite3" | "rusqlite" => Ok(Self::Sqlite),
-			"rocksdb" => Ok(Self::RocksDb),
-			"rocksdb-with-metrics" => Ok(Self::RocksDbWithMetrics),
 			"sled" => Err(Error("Sled is no longer supported as a database engine. Converting your old metadata db can be done using an older Garage binary (e.g. v0.9.4).".into())),
 			kind => Err(Error(
 				format!(
@@ -120,31 +114,6 @@ pub fn open_db(path: &PathBuf, engine: Engine, opt: &OpenOpt) -> Result<Db> {
 			}
 		}
 
-		// ---- RocksDB ----
-		#[cfg(feature = "rocksdb")]
-		Engine::RocksDb => {
-			info!("Opening RocksDb database at: {}", path.display());
-            let mut options = rocksdb::Options::default();
-            options.increase_parallelism(num_cpus::get() as i32);
-            options.create_if_missing(true);
-            options.set_compression_type(rocksdb::DBCompressionType::Zstd);
-            let txn_options = rocksdb::TransactionDBOptions::default();
-			Ok(crate::rocksdb_adapter::RocksDb::init(options, txn_options, path))
-		}
-
-		// ---- RocksDB ----
-		#[cfg(feature = "rocksdb")]
-		Engine::RocksDbWithMetrics => {
-			info!("Opening RocksDb database at: {}", path.display());
-            let mut options = rocksdb::Options::default();
-            options.increase_parallelism(num_cpus::get() as i32);
-            options.create_if_missing(true);
-            options.set_compression_type(rocksdb::DBCompressionType::Zstd);
-            let txn_options = rocksdb::TransactionDBOptions::default();
-            let db = crate::rocksdb_adapter::RocksDb::new(options, txn_options, path);
-			Ok(crate::metric_proxy::MetricDbProxy::init(db))
-		}
-
 		// Pattern is unreachable when all supported DB engines are compiled into binary. The allow
 		// attribute is added so that we won't have to change this match in case stop building
 		// support for one or more engines by default.

src/db/rocksdb_adapter.rs

@@ -1,322 +0,0 @@
-use std::path::PathBuf;
-use std::sync::{Arc, RwLock};
-use std::collections::HashMap;
-use core::ops::Bound;
-
-use rocksdb::{self as rks, BoundColumnFamily, Direction, IteratorMode, MultiThreaded, Options, Transaction, TransactionDB, TransactionDBOptions};
-
-use crate::{
-	Db, Error, IDb, ITx, ITxFn, OnCommit, Result, TxError, TxFnResult, TxOpError, TxOpResult,
-	TxResult, TxValueIter, Value, ValueIter,
-};
-
-pub struct RocksDb {
-    db: TransactionDB<MultiThreaded>,
-	column_families: RwLock<(Vec<String>, HashMap<String, usize>)>,
-}
-
-impl RocksDb {
-    pub fn init(options: Options, txn_options: TransactionDBOptions, path: &PathBuf) -> Db {
-        Db(Arc::new(Self::new(options, txn_options, path)))
-    }
-
-    pub fn new(options: Options, txn_options: TransactionDBOptions, path: &PathBuf) -> RocksDb {
-        let db = TransactionDB::open(&options, &txn_options, path).unwrap();
-        let existing_cf = TransactionDB::<MultiThreaded>::list_cf(&Options::default(), path).unwrap();
-        let existing_cf_map = existing_cf.iter().enumerate().map(|(i, n)| (n.clone(), i)).collect();
-
-        Self {
-            db,
-            column_families: RwLock::new((existing_cf, existing_cf_map)),
-        }
-    }
-
-    fn get_cf_handle(&self, tree: usize) -> Result<Arc<BoundColumnFamily>> {
-        let column_families = self.column_families.read().unwrap();
-        let name = column_families.0.get(tree);
-        name.map(|n| self.db.cf_handle(n)).flatten().ok_or(
-            Error("trying to acquire a handle on a non-existing column family".into())
-        )
-    }
-}
-
-impl IDb for RocksDb {
-    fn engine(&self) -> String {
-        "rocksdb".into()
-    }
-
-	fn open_tree(&self, name: &str) -> Result<usize> {
-        let mut column_families = self.column_families.write().unwrap();
-        let open_tree = column_families.1.get(name);
-
-        if let Some(i) = open_tree {
-            Ok(*i)
-        } else {
-            self.db.create_cf(name, &Options::default())?;
-            column_families.0.push(name.to_string());
-            let i = column_families.0.len() - 1;
-            column_families.1.insert(name.to_string(), i);
-            Ok(i)
-        }
-    }
-
-	fn list_trees(&self) -> Result<Vec<String>> {
-        Ok(self.column_families.read().unwrap().0.clone())
-    }
-
-	fn snapshot(&self, path: &PathBuf) -> Result<()> {
-        todo!("snapshots for RocksDB");
-    }
-
-	fn get(&self, tree: usize, key: &[u8]) -> Result<Option<Value>> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(self.db.get_cf(&cf_handle, key)?)
-    }
-
-	fn len(&self, tree: usize) -> Result<usize> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(self.db.iterator_cf(&cf_handle, IteratorMode::Start).count())
-    }
-
-	fn insert(&self, tree: usize, key: &[u8], value: &[u8]) -> Result<()> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(self.db.put_cf(&cf_handle, key, value)?)
-    }
-
-	fn remove(&self, tree: usize, key: &[u8]) -> Result<()> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(self.db.delete_cf(&cf_handle, key)?)
-    }
-
-	fn clear(&self, tree: usize) -> Result<()> {
-        let column_families = self.column_families.write().unwrap(); // locking against open_tree
-        let tree_name = column_families.0.get(tree).ok_or(
-            Error("trying to clear a non-existing column family".into())
-        )?;
-        self.db.drop_cf(tree_name)?;
-        self.db.create_cf(tree_name, &Options::default())?;
-        Ok(())
-    }
-
-	fn iter(&self, tree: usize) -> Result<ValueIter<'_>> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(Box::new(
-            self.db.iterator_cf(&cf_handle, IteratorMode::Start)
-                .map(|r| r
-                     .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                     .map_err(|e| e.into()))
-        ))
-    }
-
-	fn iter_rev(&self, tree: usize) -> Result<ValueIter<'_>> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        Ok(Box::new(
-            self.db.iterator_cf(&cf_handle, IteratorMode::End)
-                .map(|r| r
-                     .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                     .map_err(|e| e.into()))
-        ))
-    }
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        let start_mode = match low {
-            Bound::Included(i) | Bound::Excluded(i) => IteratorMode::From(i, Direction::Forward),
-            Bound::Unbounded => IteratorMode::Start,
-        };
-        let base_iterator = self.db.iterator_cf(&cf_handle, start_mode)
-            .map(|r| r
-                 .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                 .map_err(|e| e.into()));
-
-        let stop_value = match high {
-            Bound::Included(i) | Bound::Excluded(i) => i.to_vec(),
-            Bound::Unbounded => return Ok(Box::new(base_iterator)),
-        };
-
-        Ok(Box::new(
-            base_iterator
-                .take_while(move |r| r.as_ref().map(|(k, _v)| *k < stop_value).unwrap_or(false))
-        ))
-    }
-
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> Result<ValueIter<'_>> {
-        let cf_handle = self.get_cf_handle(tree)?;
-        let start_mode = match high {
-            Bound::Included(i) | Bound::Excluded(i) => IteratorMode::From(i, Direction::Reverse),
-            Bound::Unbounded => IteratorMode::End,
-        };
-        let base_iterator = self.db.iterator_cf(&cf_handle, start_mode)
-            .map(|r| r
-                 .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                 .map_err(|e| e.into()));
-
-        let stop_value = match low {
-            Bound::Included(i) | Bound::Excluded(i) => i.to_vec(),
-            Bound::Unbounded => return Ok(Box::new(base_iterator)),
-        };
-
-        Ok(Box::new(
-            base_iterator
-                .take_while(move |r| r.as_ref().map(|(k, _v)| *k >= stop_value).unwrap_or(false))
-        ))
-    }
-
-	fn transaction(&self, f: &dyn ITxFn) -> TxResult<OnCommit, ()> {
-        let txn = self.db.transaction();
-        let mut tx = RocksTx {
-            db: &self,
-            txn,
-        };
-
-        match f.try_on(&mut tx) {
-            TxFnResult::Ok(on_commit) => {
-				tx.txn.commit().map_err(Error::from).map_err(TxError::Db)?;
-				Ok(on_commit)
-			}
-			TxFnResult::Abort => {
-				tx.txn.rollback().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Abort(()))
-			}
-			TxFnResult::DbErr => {
-				tx.txn.rollback().map_err(Error::from).map_err(TxError::Db)?;
-				Err(TxError::Db(Error(
-					"(this message will be discarded)".into(),
-				)))
-			}
-        }
-    }
-}
-
-pub struct RocksTx<'a> {
-    db: &'a RocksDb,
-    txn: Transaction<'a, TransactionDB<MultiThreaded>>,
-}
-
-impl<'a> ITx for RocksTx<'a> {
-	fn get(&self, tree: usize, key: &[u8]) -> TxOpResult<Option<Value>> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(self.txn.get_cf(&cf_handle, key)?)
-    }
-
-	fn len(&self, tree: usize) -> TxOpResult<usize> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(self.txn.iterator_cf(&cf_handle, IteratorMode::Start).count())
-    }
-
-	fn insert(&mut self, tree: usize, key: &[u8], value: &[u8]) -> TxOpResult<()> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(self.txn.put_cf(&cf_handle, key, value)?)
-    }
-
-	fn remove(&mut self, tree: usize, key: &[u8]) -> TxOpResult<()> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(self.txn.delete_cf(&cf_handle, key)?)
-    }
-
-	fn clear(&mut self, _tree: usize) -> TxOpResult<()> {
-        unimplemented!("transactional column family clear not supported in RocksDB")
-    }
-
-	fn iter(&self, tree: usize) -> TxOpResult<TxValueIter<'_>> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(Box::new(
-            self.txn.iterator_cf(&cf_handle, IteratorMode::Start)
-                .map(|r| r
-                     .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                     .map_err(|e| e.into()))
-        ))
-    }
-
-	fn iter_rev(&self, tree: usize) -> TxOpResult<TxValueIter<'_>> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        Ok(Box::new(
-            self.txn.iterator_cf(&cf_handle, IteratorMode::End)
-                .map(|r| r
-                     .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                     .map_err(|e| e.into()))
-        ))
-    }
-
-	fn range<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        let start_mode = match low {
-            Bound::Included(i) | Bound::Excluded(i) => IteratorMode::From(i, Direction::Forward),
-            Bound::Unbounded => IteratorMode::Start,
-        };
-        let base_iterator = self.txn.iterator_cf(&cf_handle, start_mode)
-            .map(|r| r
-                 .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                 .map_err(|e| e.into()));
-
-        let stop_value = match high {
-            Bound::Included(i) | Bound::Excluded(i) => i.to_vec(),
-            Bound::Unbounded => return Ok(Box::new(base_iterator)),
-        };
-
-        Ok(Box::new(
-            base_iterator
-                .take_while(move |r| r.as_ref().map(|(k, _v)| *k < stop_value).unwrap_or(false))
-        ))
-    }
-
-	fn range_rev<'r>(
-		&self,
-		tree: usize,
-		low: Bound<&'r [u8]>,
-		high: Bound<&'r [u8]>,
-	) -> TxOpResult<TxValueIter<'_>> {
-        let cf_handle = self.db.get_cf_handle(tree)?;
-        let start_mode = match high {
-            Bound::Included(i) | Bound::Excluded(i) => IteratorMode::From(i, Direction::Reverse),
-            Bound::Unbounded => IteratorMode::End,
-        };
-        let base_iterator = self.txn.iterator_cf(&cf_handle, start_mode)
-            .map(|r| r
-                 .map(|(k, v)| (k.into_vec(), v.into_vec()))
-                 .map_err(|e| e.into()));
-
-        let stop_value = match low {
-            Bound::Included(i) | Bound::Excluded(i) => i.to_vec(),
-            Bound::Unbounded => return Ok(Box::new(base_iterator)),
-        };
-
-        Ok(Box::new(
-            base_iterator
-                .take_while(move |r| r.as_ref().map(|(k, _v)| *k >= stop_value).unwrap_or(false))
-        ))
-    }
-}
-
-impl From<rks::Error> for Error {
-	fn from(e: rks::Error) -> Error {
-		Error(format!("RocksDB: {}", e).into())
-	}
-}
-
-impl From<rks::Error> for TxOpError {
-	fn from(e: rks::Error) -> TxOpError {
-		TxOpError(e.into())
-	}
-}
-
-impl From<Error> for TxOpError {
-	fn from(e: Error) -> TxOpError {
-		TxOpError(e.into())
-	}
-}

src/db/sqlite_adapter.rs

@@ -142,7 +142,7 @@ impl IDb for SqliteDb {
 	fn snapshot(&self, to: &PathBuf) -> Result<()> {
 		fn progress(p: rusqlite::backup::Progress) {
 			let percent = (p.pagecount - p.remaining) * 100 / p.pagecount;
-			info!("Sqlite snapshot progres: {}%", percent);
+			info!("Sqlite snapshot progress: {}%", percent);
 		}
 		self.db
 			.get()?
@@ -304,7 +304,7 @@ impl<'a> SqliteTx<'a> {
 	fn get_tree(&self, i: usize) -> TxOpResult<&'_ str> {
 		self.trees.get(i).map(Arc::as_ref).ok_or_else(|| {
 			TxOpError(Error(
-				"invalid tree id (it might have been openned after the transaction started)".into(),
+				"invalid tree id (it might have been opened after the transaction started)".into(),
 			))
 		})
 	}

src/garage/Cargo.toml

@@ -89,7 +89,6 @@ k2v = [ "garage_util/k2v", "garage_api/k2v" ]
 # Database engines
 lmdb = [ "garage_model/lmdb" ]
 sqlite = [ "garage_model/sqlite" ]
-rocksdb = [ "garage_model/rocksdb" ]
 
 # Automatic registration and discovery via Consul API
 consul-discovery = [ "garage_rpc/consul-discovery" ]

src/garage/cli/layout.rs

@@ -129,7 +129,7 @@ pub async fn cmd_assign_role(
 					zone: args
 						.zone
 						.clone()
-						.ok_or("Please specifiy a zone with the -z flag")?,
+						.ok_or("Please specify a zone with the -z flag")?,
 					capacity,
 					tags: args.tags.clone(),
 				}
@@ -145,7 +145,7 @@ pub async fn cmd_assign_role(
 
 	send_layout(rpc_cli, rpc_host, layout).await?;
 
-	println!("Role changes are staged but not yet commited.");
+	println!("Role changes are staged but not yet committed.");
 	println!("Use `garage layout show` to view staged role changes,");
 	println!("and `garage layout apply` to enact staged changes.");
 	Ok(())
@@ -172,7 +172,7 @@ pub async fn cmd_remove_role(
 
 	send_layout(rpc_cli, rpc_host, layout).await?;
 
-	println!("Role removal is staged but not yet commited.");
+	println!("Role removal is staged but not yet committed.");
 	println!("Use `garage layout show` to view staged role changes,");
 	println!("and `garage layout apply` to enact staged changes.");
 	Ok(())

src/garage/cli/structs.rs

@@ -184,7 +184,7 @@ pub struct SkipDeadNodesOpt {
 	/// This will generally be the current layout version.
 	#[structopt(long = "version")]
 	pub(crate) version: u64,
-	/// Allow the skip even if a quorum of ndoes could not be found for
+	/// Allow the skip even if a quorum of nodes could not be found for
 	/// the data among the remaining nodes
 	#[structopt(long = "allow-missing-data")]
 	pub(crate) allow_missing_data: bool,

src/garage/main.rs

@@ -107,7 +107,7 @@ async fn main() {
 	);
 
 	// Initialize panic handler that aborts on panic and shows a nice message.
-	// By default, Tokio continues runing normally when a task panics. We want
+	// By default, Tokio continues running normally when a task panics. We want
 	// to avoid this behavior in Garage as this would risk putting the process in an
 	// unknown/uncontrollable state. We prefer to exit the process and restart it
 	// from scratch, so that it boots back into a fresh, known state.

src/garage/secrets.rs

@@ -104,7 +104,7 @@ pub(crate) fn fill_secret(
 
 	if let Some(val) = cli_value {
 		if config_secret.is_some() || config_secret_file.is_some() {
-			debug!("Overriding secret `{}` using value specified using CLI argument or environnement variable.", name);
+			debug!("Overriding secret `{}` using value specified using CLI argument or environment variable.", name);
 		}
 
 		*config_secret = Some(val);

src/garage/tests/common/custom_requester.rs

@@ -153,7 +153,7 @@ impl<'a> RequestBuilder<'a> {
 
 	pub async fn send(&mut self) -> Result<Response<Body>, String> {
 		// TODO this is a bit incorrect in that path and query params should be url-encoded and
-		// aren't, but this is good enought for now.
+		// aren't, but this is good enough for now.
 
 		let query = query_param_to_string(&self.query_params);
 		let (host, path) = if self.vhost_style {
@@ -210,9 +210,9 @@ impl<'a> RequestBuilder<'a> {
 					HeaderName::from_static("x-amz-decoded-content-length"),
 					HeaderValue::from_str(&self.body.len().to_string()).unwrap(),
 				);
-				// Get lenght of body by doing the conversion to a streaming body with an
+				// Get length of body by doing the conversion to a streaming body with an
 				// invalid signature (we don't know the seed) just to get its length. This
-				// is a pretty lazy and inefficient way to do it, but it's enought for test
+				// is a pretty lazy and inefficient way to do it, but it's enough for test
 				// code.
 				all_headers.insert(
 					CONTENT_LENGTH,

src/k2v-client/bin/k2v-cli.rs

@@ -54,7 +54,7 @@ enum Command {
 		partition_key: String,
 		/// Sort key to read from
 		sort_key: String,
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: ReadOutputKind,
 	},
@@ -70,7 +70,7 @@ enum Command {
 		/// Timeout, in seconds
 		#[clap(short = 'T', long)]
 		timeout: Option<u64>,
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: ReadOutputKind,
 	},
@@ -87,7 +87,7 @@ enum Command {
 		/// Timeout, in seconds
 		#[clap(short = 'T', long)]
 		timeout: Option<u64>,
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: BatchOutputKind,
 	},
@@ -103,7 +103,7 @@ enum Command {
 	},
 	/// List partition keys
 	ReadIndex {
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: BatchOutputKind,
 		/// Output only partition keys matching this filter
@@ -114,7 +114,7 @@ enum Command {
 	ReadRange {
 		/// Partition key to read from
 		partition_key: String,
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: BatchOutputKind,
 		/// Output only sort keys matching this filter
@@ -125,7 +125,7 @@ enum Command {
 	DeleteRange {
 		/// Partition key to delete from
 		partition_key: String,
-		/// Output formating
+		/// Output formatting
 		#[clap(flatten)]
 		output_kind: BatchOutputKind,
 		/// Delete only sort keys matching this filter
@@ -185,10 +185,10 @@ struct ReadOutputKind {
 	/// Raw output. Conflicts generate error, causality token is not returned
 	#[clap(short, long, group = "output-kind")]
 	raw: bool,
-	/// Human formated output
+	/// Human formatted output
 	#[clap(short = 'H', long, group = "output-kind")]
 	human: bool,
-	/// JSON formated output
+	/// JSON formatted output
 	#[clap(short, long, group = "output-kind")]
 	json: bool,
 }
@@ -207,7 +207,7 @@ impl ReadOutputKind {
 			let mut val = val.value;
 			if val.len() != 1 {
 				eprintln!(
-					"Raw mode can only read non-concurent values, found {} values, expected 1",
+					"Raw mode can only read non-concurrent values, found {} values, expected 1",
 					val.len()
 				);
 				exit(1);
@@ -265,10 +265,10 @@ impl ReadOutputKind {
 #[derive(Parser, Debug)]
 #[clap(group = clap::ArgGroup::new("output-kind").multiple(false).required(false))]
 struct BatchOutputKind {
-	/// Human formated output
+	/// Human formatted output
 	#[clap(short = 'H', long, group = "output-kind")]
 	human: bool,
-	/// JSON formated output
+	/// JSON formatted output
 	#[clap(short, long, group = "output-kind")]
 	json: bool,
 }

src/k2v-client/lib.rs

@@ -336,7 +336,7 @@ impl K2vClient {
 			.collect())
 	}
 
-	/// Perform a DeleteBatch request, deleting mutiple values or range of values at once, without
+	/// Perform a DeleteBatch request, deleting multiple values or range of values at once, without
 	/// providing causality information.
 	pub async fn delete_batch(&self, operations: &[BatchDeleteOp<'_>]) -> Result<Vec<u64>, Error> {
 		let url = self.build_url(None, &[("delete", "")]);

src/model/Cargo.toml

@@ -47,4 +47,3 @@ default = [ "lmdb", "sqlite" ]
 k2v = [ "garage_util/k2v" ]
 lmdb = [ "garage_db/lmdb" ]
 sqlite = [ "garage_db/sqlite" ]
-rocksdb = [ "garage_db/rocksdb" ]

src/model/bucket_alias_table.rs

@@ -89,9 +89,9 @@ pub fn is_valid_bucket_name(n: &str) -> bool {
 	//  Bucket names must start and end with a letter or a number
 	&& !n.starts_with(&['-', '.'][..])
 	&& !n.ends_with(&['-', '.'][..])
-	// Bucket names must not be formated as an IP address
+	// Bucket names must not be formatted as an IP address
 	&& n.parse::<std::net::IpAddr>().is_err()
-	// Bucket names must not start wih "xn--"
+	// Bucket names must not start with "xn--"
 	&& !n.starts_with("xn--")
 	// Bucket names must not end with "-s3alias"
 	&& !n.ends_with("-s3alias")

src/model/bucket_table.rs

@@ -14,7 +14,7 @@ mod v08 {
 	/// A bucket is a collection of objects
 	///
 	/// Its parameters are not directly accessible as:
-	///  - It must be possible to merge paramaters, hence the use of a LWW CRDT.
+	///  - It must be possible to merge parameters, hence the use of a LWW CRDT.
 	///  - A bucket has 2 states, Present or Deleted and parameters make sense only if present.
 	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 	pub struct Bucket {
@@ -126,7 +126,7 @@ impl AutoCrdt for BucketQuotas {
 }
 
 impl BucketParams {
-	/// Create an empty BucketParams with no authorized keys and no website accesss
+	/// Create an empty BucketParams with no authorized keys and no website access
 	fn new() -> Self {
 		BucketParams {
 			creation_date: now_msec(),

src/model/garage.rs

@@ -124,9 +124,6 @@ impl Garage {
 			db::Engine::Lmdb => {
 				db_path.push("db.lmdb");
 			}
-			db::Engine::RocksDb | db::Engine::RocksDbWithMetrics => {
-				db_path.push("db.rocksdb");
-			}
 		}
 		let db_opt = db::OpenOpt {
 			fsync: config.metadata_fsync,

src/model/helper/locked.rs

@@ -231,7 +231,7 @@ impl<'a> LockedHelper<'a> {
 		let bucket_p_local_alias_key = (key.key_id.clone(), alias_name.clone());
 
 		// Calculate the timestamp to assign to this aliasing in the two local_aliases maps
-		// (the one from key to bucket, and the reverse one stored in the bucket iself)
+		// (the one from key to bucket, and the reverse one stored in the bucket itself)
 		// so that merges on both maps in case of a concurrent operation resolve
 		// to the same alias being set
 		let alias_ts = increment_logical_clock_2(
@@ -279,7 +279,8 @@ impl<'a> LockedHelper<'a> {
 			.local_aliases
 			.get(alias_name)
 			.cloned()
-			.flatten() != Some(bucket_id)
+			.flatten()
+			!= Some(bucket_id)
 		{
 			return Err(GarageError::Message(format!(
 				"Bucket {:?} does not have alias {} in namespace of key {}",

src/model/k2v/rpc.rs

@@ -310,7 +310,7 @@ impl K2VRpcHandler {
 		// - we have a response to a read quorum of requests (e.g. 2/3), and an extra delay
 		//   has passed since the quorum was achieved
 		// - a global RPC timeout expired
-		// The extra delay after a quorum was received is usefull if the third response was to
+		// The extra delay after a quorum was received is useful if the third response was to
 		// arrive during this short interval: this would allow us to consider all the data seen
 		// by that last node in the response we produce, and would likely help reduce the
 		// size of the seen marker that we will return (because we would have an info of the
@@ -500,7 +500,7 @@ impl K2VRpcHandler {
 		} else {
 			// If no seen marker was specified, we do not poll for anything.
 			// We return immediately with the set of known items (even if
-			// it is empty), which will give the client an inital view of
+			// it is empty), which will give the client an initial view of
 			// the dataset and an initial seen marker for further
 			// PollRange calls.
 			self.poll_range_read_range(range, &RangeSeenMarker::default())

src/model/s3/lifecycle_worker.rs

@@ -70,7 +70,7 @@ pub fn register_bg_vars(
 
 impl LifecycleWorker {
 	pub fn new(garage: Arc<Garage>, persister: PersisterShared<LifecycleWorkerPersisted>) -> Self {
-		let today = today();
+		let today = today(garage.config.use_local_tz);
 		let last_completed = persister.get_with(|x| {
 			x.last_completed
 				.as_deref()
@@ -205,8 +205,9 @@ impl Worker for LifecycleWorker {
 	async fn wait_for_work(&mut self) -> WorkerState {
 		match &self.state {
 			State::Completed(d) => {
+				let use_local_tz = self.garage.config.use_local_tz;
 				let next_day = d.succ_opt().expect("no next day");
-				let next_start = midnight_ts(next_day);
+				let next_start = midnight_ts(next_day, use_local_tz);
 				loop {
 					let now = now_msec();
 					if now < next_start {
@@ -218,7 +219,7 @@ impl Worker for LifecycleWorker {
 						break;
 					}
 				}
-				self.state = State::start(std::cmp::max(next_day, today()));
+				self.state = State::start(std::cmp::max(next_day, today(use_local_tz)));
 			}
 			State::Running { .. } => (),
 		}
@@ -385,10 +386,16 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
 	true
 }
 
-fn midnight_ts(date: NaiveDate) -> u64 {
+fn midnight_ts(date: NaiveDate, use_local_tz: bool) -> u64 {
-	date.and_hms_opt(0, 0, 0)
+	let midnight = date.and_hms_opt(0, 0, 0).expect("midnight does not exist");
-		.expect("midnight does not exist")
+	if use_local_tz {
-		.timestamp_millis() as u64
+		return midnight
+			.and_local_timezone(Local)
+			.single()
+			.expect("bad local midnight")
+			.timestamp_millis() as u64;
+	}
+	midnight.timestamp_millis() as u64
 }
 
 fn next_date(ts: u64) -> NaiveDate {
@@ -399,6 +406,9 @@ fn next_date(ts: u64) -> NaiveDate {
 		.expect("no next day")
 }
 
-fn today() -> NaiveDate {
+fn today(use_local_tz: bool) -> NaiveDate {
+	if use_local_tz {
+		return Local::now().naive_local().date();
+	}
 	Utc::now().naive_utc().date()
 }

src/model/s3/object_table.rs

@@ -31,11 +31,11 @@ mod v08 {
 		/// The key at which the object is stored in its bucket, used as sorting key
 		pub key: String,
 
-		/// The list of currenty stored versions of the object
+		/// The list of currently stored versions of the object
 		pub(super) versions: Vec<ObjectVersion>,
 	}
 
-	/// Informations about a version of an object
+	/// Information about a version of an object
 	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 	pub struct ObjectVersion {
 		/// Id of the version
@@ -109,11 +109,11 @@ mod v09 {
 		/// The key at which the object is stored in its bucket, used as sorting key
 		pub key: String,
 
-		/// The list of currenty stored versions of the object
+		/// The list of currently stored versions of the object
 		pub(super) versions: Vec<ObjectVersion>,
 	}
 
-	/// Informations about a version of an object
+	/// Information about a version of an object
 	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 	pub struct ObjectVersion {
 		/// Id of the version
@@ -186,11 +186,11 @@ mod v010 {
 		/// The key at which the object is stored in its bucket, used as sorting key
 		pub key: String,
 
-		/// The list of currenty stored versions of the object
+		/// The list of currently stored versions of the object
 		pub(super) versions: Vec<ObjectVersion>,
 	}
 
-	/// Informations about a version of an object
+	/// Information about a version of an object
 	#[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 	pub struct ObjectVersion {
 		/// Id of the version

src/model/s3/version_table.rs

@@ -49,7 +49,7 @@ mod v08 {
 		pub offset: u64,
 	}
 
-	/// Informations about a single block
+	/// Information about a single block
 	#[derive(PartialEq, Eq, Ord, PartialOrd, Clone, Copy, Debug, Serialize, Deserialize)]
 	pub struct VersionBlock {
 		/// Blake2 sum of the block

src/model/snapshot.rs

@@ -20,7 +20,7 @@ static SNAPSHOT_MUTEX: Mutex<()> = Mutex::new(());
 
 // ================ snapshotting logic =====================
 
-/// Run snashot_metadata in a blocking thread and async await on it
+/// Run snapshot_metadata in a blocking thread and async await on it
 pub async fn async_snapshot_metadata(garage: &Arc<Garage>) -> Result<(), Error> {
 	let garage = garage.clone();
 	let worker = tokio::task::spawn_blocking(move || snapshot_metadata(&garage));

src/net/error.rs

@@ -59,7 +59,7 @@ impl<T> From<tokio::sync::mpsc::error::SendError<T>> for Error {
 	}
 }
 
-/// Ths trait adds a `.log_err()` method on `Result<(), E>` types,
+/// The trait adds a `.log_err()` method on `Result<(), E>` types,
 /// which dismisses the error by logging it to stderr.
 pub trait LogError {
 	fn log_err(self, msg: &'static str);

src/net/message.rs

@@ -18,7 +18,7 @@ use crate::util::*;
 /// in the send queue of the client, and their responses in the send queue of the
 /// server. Lower values mean higher priority.
 ///
-/// This mechanism is usefull for messages bigger than the maximum chunk size
+/// This mechanism is useful for messages bigger than the maximum chunk size
 /// (set at `0x4000` bytes), such as large file transfers.
 /// In such case, all of the messages in the send queue with the highest priority
 /// will take turns to send individual chunks, in a round-robin fashion.
@@ -102,7 +102,7 @@ pub trait Message: Serialize + for<'de> Deserialize<'de> + Send + Sync + 'static
 
 /// The Req<M> is a helper object used to create requests and attach them
 /// a stream of data. If the stream is a fixed Bytes and not a ByteStream,
-/// Req<M> is cheaply clonable to allow the request to be sent to different
+/// Req<M> is cheaply cloneable to allow the request to be sent to different
 /// peers (Clone will panic if the stream is a ByteStream).
 pub struct Req<M: Message> {
 	pub(crate) msg: Arc<M>,

src/net/netapp.rs

@@ -41,7 +41,7 @@ pub(crate) type VersionTag = [u8; 16];
 pub(crate) const NETAPP_VERSION_TAG: u64 = 0x6772676e65740010; // grgnet 0x0010 (1.0)
 
 /// HelloMessage is sent by the client on a Netapp connection to indicate
-/// that they are also a server and ready to recieve incoming connections
+/// that they are also a server and ready to receive incoming connections
 /// at the specified address and port. If the client doesn't know their
 /// public address, they don't need to specify it and we look at the
 /// remote address of the socket is used instead.
@@ -290,7 +290,7 @@ impl NetApp {
 	/// Attempt to connect to a peer, given by its ip:port and its public key.
 	/// The public key will be checked during the secret handshake process.
 	/// This function returns once the connection has been established and a
-	/// successfull handshake was made. At this point we can send messages to
+	/// successful handshake was made. At this point we can send messages to
 	/// the other node with `Netapp::request`
 	pub async fn try_connect(self: Arc<Self>, ip: SocketAddr, id: NodeID) -> Result<(), Error> {
 		// Don't connect to ourself, we don't care

src/net/peering.rs

@@ -138,7 +138,7 @@ pub enum PeerConnState {
 	/// A connection tentative is in progress (the nth, where n is the value stored)
 	Trying(usize),
 
-	/// We abandonned trying to connect to this peer (too many failed attempts)
+	/// We abandoned trying to connect to this peer (too many failed attempts)
 	Abandonned,
 }
 

src/net/send.rs

@@ -28,7 +28,7 @@ use crate::stream::*;
 //   - if error:
 //       - u8: error kind, encoded using error::io_errorkind_to_u8
 //       - rest: error message
-//   - absent for cancel messag
+//   - absent for cancel message
 
 pub(crate) type RequestID = u32;
 pub(crate) type ChunkLength = u16;
@@ -217,7 +217,7 @@ impl<'a> futures::Future for SendQueuePollNextReady<'a> {
 
 enum DataFrame {
 	/// a fixed size buffer containing some data + a boolean indicating whether
-	/// there may be more data comming from this stream. Can be used for some
+	/// there may be more data coming from this stream. Can be used for some
 	/// optimization. It's an error to set it to false if there is more data, but it is correct
 	/// (albeit sub-optimal) to set it to true if there is nothing coming after
 	Data(Bytes, bool),
@@ -310,7 +310,7 @@ pub(crate) trait SendLoop: Sync {
 			// recv_fut is cancellation-safe according to tokio doc,
 			// send_fut is cancellation-safe as implemented above?
 			tokio::select! {
-				biased;	// always read incomming channel first if it has data
+				biased;	// always read incoming channel first if it has data
 				sth = recv_fut => {
 					match sth {
 						Some(SendItem::Stream(id, prio, order_tag, data)) => {

src/net/stream.rs

@@ -16,7 +16,7 @@ use crate::bytes_buf::BytesBuf;
 ///
 /// Items sent in the ByteStream may be errors of type `std::io::Error`.
 /// An error indicates the end of the ByteStream: a reader should no longer read
-/// after recieving an error, and a writer should stop writing after sending an error.
+/// after receiving an error, and a writer should stop writing after sending an error.
 pub type ByteStream = Pin<Box<dyn Stream<Item = Packet> + Send + Sync>>;
 
 /// A packet sent in a ByteStream, which may contain either

src/net/test.rs

@@ -66,7 +66,7 @@ async fn run_test_inner(port_base: u16) {
 	println!("A pl2: {:?}", pl2);
 	assert_eq!(pl2.len(), 2);
 
-	// Connect third ndoe and check it peers with everyone
+	// Connect third node and check it peers with everyone
 	let (thread3, _netapp3, peering3) =
 		run_netapp(netid, pk3, sk3, addr3, vec![(pk2, addr2)], stop_rx.clone());
 	tokio::time::sleep(Duration::from_secs(3)).await;

src/net/util.rs

@@ -25,7 +25,7 @@ where
 /// This async function returns only when a true signal was received
 /// from a watcher that tells us when to exit.
 ///
-/// Usefull in a select statement to interrupt another
+/// Useful in a select statement to interrupt another
 /// future:
 /// ```ignore
 /// select!(

src/rpc/layout/graph_algo.rs

@@ -133,7 +133,7 @@ impl Graph<FlowEdge> {
 	/// This function shuffles the order of the edge lists. It keeps the ids of the
 	/// reversed edges consistent.
 	fn shuffle_edges(&mut self) {
-		// We use deterministic randomness so that the layout calculation algorihtm
+		// We use deterministic randomness so that the layout calculation algorithm
 		// will output the same thing every time it is run. This way, the results
 		// pre-calculated in `garage layout show` will match exactly those used
 		// in practice with `garage layout apply`

src/rpc/layout/helper.rs

@@ -90,7 +90,7 @@ impl LayoutHelper {
 		// sync_map_min is the minimum value of sync_map among storage nodes
 		// in the cluster (non-gateway nodes only, current and previous layouts).
 		// It is the highest layout version for which we know that all relevant
-		// storage nodes have fullfilled a sync, and therefore it is safe to
+		// storage nodes have fulfilled a sync, and therefore it is safe to
 		// use a read quorum within that layout to ensure consistency.
 		// Gateway nodes are excluded here because they hold no relevant data
 		// (they store the bucket and access key tables, but we don't have

src/rpc/layout/manager.rs

@@ -48,7 +48,7 @@ impl LayoutManager {
 			Ok(x) => {
 				if x.current().replication_factor != replication_factor.replication_factor() {
 					return Err(Error::Message(format!(
-						"Prevous cluster layout has replication factor {}, which is different than the one specified in the config file ({}). The previous cluster layout can be purged, if you know what you are doing, simply by deleting the `cluster_layout` file in your metadata directory.",
+						"Previous cluster layout has replication factor {}, which is different than the one specified in the config file ({}). The previous cluster layout can be purged, if you know what you are doing, simply by deleting the `cluster_layout` file in your metadata directory.",
 						x.current().replication_factor,
 						replication_factor.replication_factor()
 					)));

src/rpc/layout/mod.rs

@@ -241,7 +241,7 @@ mod v010 {
 		/// The versions currently in use in the cluster
 		pub versions: Vec<LayoutVersion>,
 		/// At most 5 of the previous versions, not used by the garage_table
-		/// module, but usefull for the garage_block module to find data blocks
+		/// module, but useful for the garage_block module to find data blocks
 		/// that have not yet been moved
 		pub old_versions: Vec<LayoutVersion>,
 

src/rpc/layout/test.rs

@@ -9,7 +9,7 @@ use crate::replication_mode::ReplicationFactor;
 
 // This function checks that the partition size S computed is at least better than the
 // one given by a very naive algorithm. To do so, we try to run the naive algorithm
-// assuming a partion size of S+1. If we succed, it means that the optimal assignment
+// assuming a partition size of S+1. If we succeed, it means that the optimal assignment
 // was not optimal. The naive algorithm is the following :
 // - we compute the max number of partitions associated to every node, capped at the
 // partition number. It gives the number of tokens of every node.

src/rpc/layout/version.rs

@@ -471,7 +471,7 @@ impl LayoutVersion {
 			}
 		}
 
-		// We clear the ring assignemnt data
+		// We clear the ring assignment data
 		self.ring_assignment_data = Vec::<CompactNodeType>::new();
 
 		Ok(Some(old_assignment))

src/rpc/rpc_helper.rs

@@ -413,7 +413,7 @@ impl RpcHelper {
 	/// Make a RPC call to multiple servers, returning either a Vec of responses,
 	/// or an error if quorum could not be reached due to too many errors
 	///
-	/// Contrary to try_call_many, this fuction is especially made for broadcast
+	/// Contrary to try_call_many, this function is especially made for broadcast
 	/// write operations. In particular:
 	///
 	/// - The request are sent to all specified nodes as soon as `try_write_many_sets`
@@ -506,7 +506,7 @@ impl RpcHelper {
 
 			// If we have a quorum of ok in all quorum sets, then it's a success!
 			if result_tracker.all_quorums_ok() {
-				// Continue all other requets in background
+				// Continue all other requests in background
 				tokio::spawn(async move {
 					resp_stream.collect::<Vec<(Uuid, Result<_, _>)>>().await;
 					drop(drop_on_complete);

src/rpc/system.rs

@@ -54,7 +54,7 @@ pub const SYSTEM_RPC_PATH: &str = "garage_rpc/system.rs/SystemRpc";
 /// RPC messages related to membership
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum SystemRpc {
-	/// Response to successfull advertisements
+	/// Response to successful advertisements
 	Ok,
 	/// Request to connect to a specific node (in <pubkey>@<host>:<port> format, pubkey = full-length node ID)
 	Connect(String),
@@ -172,7 +172,7 @@ pub struct ClusterHealth {
 pub enum ClusterHealthStatus {
 	/// All nodes are available
 	Healthy,
-	/// Some storage nodes are unavailable, but quorum is stil
+	/// Some storage nodes are unavailable, but quorum is still
 	/// achieved for all partitions
 	Degraded,
 	/// Quorum is not available for some partitions
@@ -286,7 +286,7 @@ impl System {
 		let mut local_status = NodeStatus::initial(replication_factor, &layout_manager);
 		local_status.update_disk_usage(&config.metadata_dir, &config.data_dir);
 
-		// ---- if enabled, set up additionnal peer discovery methods ----
+		// ---- if enabled, set up additional peer discovery methods ----
 		#[cfg(feature = "consul-discovery")]
 		let consul_discovery = match &config.consul_discovery {
 			Some(cfg) => Some(
@@ -337,7 +337,7 @@ impl System {
 		Ok(sys)
 	}
 
-	/// Perform bootstraping, starting the ping loop
+	/// Perform bootstrapping, starting the ping loop
 	pub async fn run(self: Arc<Self>, must_exit: watch::Receiver<bool>) {
 		join!(
 			self.netapp.clone().listen(
@@ -807,6 +807,16 @@ impl NodeStatus {
 
 	fn update_disk_usage(&mut self, meta_dir: &Path, data_dir: &DataDirEnum) {
 		use nix::sys::statvfs::statvfs;
+
+		// The HashMap used below requires a filesystem identifier from statfs (instead of statvfs) on FreeBSD, as
+		// FreeBSD's statvfs filesystem identifier is "not meaningful in this implementation" (man 3 statvfs).
+
+		#[cfg(target_os = "freebsd")]
+		let get_filesystem_id = |path: &Path| match nix::sys::statfs::statfs(path) {
+			Ok(fs) => Some(fs.filesystem_id()),
+			Err(_) => None,
+		};
+
 		let mount_avail = |path: &Path| match statvfs(path) {
 			Ok(x) => {
 				let avail = x.blocks_available() as u64 * x.fragment_size() as u64;
@@ -817,6 +827,7 @@ impl NodeStatus {
 		};
 
 		self.meta_disk_avail = mount_avail(meta_dir).map(|(_, a, t)| (a, t));
+
 		self.data_disk_avail = match data_dir {
 			DataDirEnum::Single(dir) => mount_avail(dir).map(|(_, a, t)| (a, t)),
 			DataDirEnum::Multiple(dirs) => (|| {
@@ -827,12 +838,25 @@ impl NodeStatus {
 					if dir.capacity.is_none() {
 						continue;
 					}
+
+					#[cfg(not(target_os = "freebsd"))]
 					match mount_avail(&dir.path) {
 						Some((fsid, avail, total)) => {
 							mounts.insert(fsid, (avail, total));
 						}
 						None => return None,
 					}
+
+					#[cfg(target_os = "freebsd")]
+					match get_filesystem_id(&dir.path) {
+						Some(fsid) => match mount_avail(&dir.path) {
+							Some((_, avail, total)) => {
+								mounts.insert(fsid, (avail, total));
+							}
+							None => return None,
+						},
+						None => return None,
+					}
 				}
 				Some(
 					mounts

src/table/gc.rs

@@ -258,14 +258,14 @@ impl<F: TableSchema, R: TableReplication> TableGc<F, R> {
 			.await
 			.err_context("GC: remote delete tombstones")?;
 
-		// GC has been successfull for all of these entries.
+		// GC has been successful for all of these entries.
 		// We now remove them all from our local table and from the GC todo list.
 		for item in items {
 			self.data
 				.delete_if_equal_hash(&item.key[..], item.value_hash)
 				.err_context("GC: local delete tombstones")?;
 			item.remove_if_equal(&self.data.gc_todo)
-				.err_context("GC: remove from todo list after successfull GC")?;
+				.err_context("GC: remove from todo list after successful GC")?;
 		}
 
 		Ok(())
@@ -383,7 +383,7 @@ impl GcTodoEntry {
 
 	/// Removes the GcTodoEntry from the gc_todo tree if the
 	/// hash of the serialized value is the same here as in the tree.
-	/// This is usefull to remove a todo entry only under the condition
+	/// This is useful to remove a todo entry only under the condition
 	/// that it has not changed since the time it was read, i.e.
 	/// what we have to do is still the same
 	pub(crate) fn remove_if_equal(&self, gc_todo_tree: &db::Tree) -> Result<(), Error> {

src/table/replication/parameters.rs

@@ -13,12 +13,12 @@ pub trait TableReplication: Send + Sync + 'static {
 
 	/// Which nodes to send read requests to
 	fn read_nodes(&self, hash: &Hash) -> Vec<Uuid>;
-	/// Responses needed to consider a read succesfull
+	/// Responses needed to consider a read successful
 	fn read_quorum(&self) -> usize;
 
 	/// Which nodes to send writes to
 	fn write_sets(&self, hash: &Hash) -> Self::WriteSets;
-	/// Responses needed to consider a write succesfull in each set
+	/// Responses needed to consider a write successful in each set
 	fn write_quorum(&self) -> usize;
 
 	// Accessing partitions, for Merkle tree & sync

src/table/sync.rs

@@ -316,7 +316,7 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> {
 			SyncRpc::RootCkDifferent(true) => VecDeque::from(vec![root_ck_key]),
 			x => {
 				return Err(Error::Message(format!(
-					"Invalid respone to RootCkHash RPC: {}",
+					"Invalid response to RootCkHash RPC: {}",
 					debug_serialize(x)
 				)));
 			}
@@ -362,7 +362,7 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> {
 						SyncRpc::Node(_, node) => node,
 						x => {
 							return Err(Error::Message(format!(
-								"Invalid respone to GetNode RPC: {}",
+								"Invalid response to GetNode RPC: {}",
 								debug_serialize(x)
 							)));
 						}

src/table/table.rs

@@ -171,11 +171,11 @@ impl<F: TableSchema, R: TableReplication> Table<F, R> {
 		// We will here batch all items into a single request for each concerned
 		// node, with all of the entries it must store within that request.
 		// Each entry has to be saved to a specific list of "write sets", i.e. a set
-		// of node within wich a quorum must be achieved. In normal operation, there
+		// of node within which a quorum must be achieved. In normal operation, there
 		// is a single write set which corresponds to the quorum in the current
 		// cluster layout, but when the layout is updated, multiple write sets might
 		// have to be handled at once. Here, since we are sending many entries, we
-		// will have to handle many write sets in all cases. The algorihtm is thus
+		// will have to handle many write sets in all cases. The algorithm is thus
 		// to send one request to each node with all the items it must save,
 		// and keep track of the OK responses within each write set: if for all sets
 		// a quorum of nodes has answered OK, then the insert has succeeded and

src/util/background/worker.rs

@@ -14,7 +14,7 @@ use crate::background::{WorkerInfo, WorkerStatus};
 use crate::error::Error;
 use crate::time::now_msec;
 
-// All workers that haven't exited for this time after an exit signal was recieved
+// All workers that haven't exited for this time after an exit signal was received
 // will be interrupted in the middle of whatever they are doing.
 const EXIT_DEADLINE: Duration = Duration::from_secs(8);
 
@@ -54,7 +54,7 @@ pub trait Worker: Send {
 	async fn work(&mut self, must_exit: &mut watch::Receiver<bool>) -> Result<WorkerState, Error>;
 
 	/// Wait for work: await for some task to become available.  This future can be interrupted in
-	/// the middle for any reason, for example if an interrupt signal was recieved.
+	/// the middle for any reason, for example if an interrupt signal was received.
 	async fn wait_for_work(&mut self) -> WorkerState;
 }
 

src/util/config.rs

@@ -27,6 +27,10 @@ pub struct Config {
 	#[serde(default)]
 	pub disable_scrub: bool,
 
+	/// Use local timezone
+	#[serde(default)]
+	pub use_local_tz: bool,
+
 	/// Automatic snapshot interval for metadata
 	#[serde(default)]
 	pub metadata_auto_snapshot_interval: Option<String>,
@@ -89,12 +93,12 @@ pub struct Config {
 	/// the addresses announced to other peers to a specific subnet.
 	pub rpc_public_addr_subnet: Option<String>,
 
-	/// Timeout for Netapp's ping messagess
+	/// Timeout for Netapp's ping messages
 	pub rpc_ping_timeout_msec: Option<u64>,
 	/// Timeout for Netapp RPC calls
 	pub rpc_timeout_msec: Option<u64>,
 
-	// -- Bootstraping and discovery
+	// -- Bootstrapping and discovery
 	/// Bootstrap peers RPC address
 	#[serde(default)]
 	pub bootstrap_peers: Vec<String>,

src/util/crdt/crdt.rs

@@ -33,8 +33,8 @@ pub trait Crdt {
 /// arises very often, for example with a Lww or a LwwMap: the value type has to be a CRDT so that
 /// we have a rule for what to do when timestamps aren't enough to disambiguate (in a distributed
 /// system, anything can happen!), and with AutoCrdt the rule is to make an arbitrary (but
-/// determinstic) choice between the two.  When using an Option<T> instead with this impl, ambiguity
+/// deterministic) choice between the two.  When using an Option<T> instead with this impl, ambiguity
-/// cases are explicitely stored as None, which allows us to detect the ambiguity and handle it in
+/// cases are explicitly stored as None, which allows us to detect the ambiguity and handle it in
 /// the way we want. (this can only work if we are happy with losing the value when an ambiguity
 /// arises)
 impl<T> Crdt for Option<T>

src/util/crdt/lww.rs

@@ -16,7 +16,7 @@ use crate::crdt::crdt::*;
 /// In our case, we add the constraint that the value that is wrapped inside the LWW CRDT must
 /// itself be a CRDT: in the case when the timestamp does not allow us to decide on which value to
 /// keep, the merge rule of the inner CRDT is applied on the wrapped values.  (Note that all types
-/// that implement the `Ord` trait get a default CRDT implemetnation that keeps the maximum value.
+/// that implement the `Ord` trait get a default CRDT implementation that keeps the maximum value.
 /// This enables us to use LWW directly with primitive data types such as numbers or strings. It is
 /// generally desirable in this case to never explicitly produce LWW values with the same timestamp
 /// but different inner values, as the rule to keep the maximum value isn't generally the desired
@@ -28,9 +28,9 @@ use crate::crdt::crdt::*;
 ///
 /// Given that clocks are not too desynchronized, this assumption
 /// is enough for most cases, as there is few chance that two humans
-/// coordonate themself faster than the time difference between two NTP servers.
+/// coordinate themself faster than the time difference between two NTP servers.
 ///
-/// As a more concret example, let's suppose you want to upload a file
+/// As a more concrete example, let's suppose you want to upload a file
 /// with the same key (path) in the same bucket at the very same time.
 /// For each request, the file will be timestamped by the receiving server
 /// and may differ from what you observed with your atomic clock!
@@ -84,16 +84,16 @@ where
 		&self.v
 	}
 
-	/// Take the value inside the CRDT (discards the timesamp)
+	/// Take the value inside the CRDT (discards the timestamp)
 	pub fn take(self) -> T {
 		self.v
 	}
 
 	/// Get a mutable reference to the CRDT's value
 	///
-	/// This is usefull to mutate the inside value without changing the LWW timestamp.
+	/// This is useful to mutate the inside value without changing the LWW timestamp.
 	/// When such mutation is done, the merge between two LWW values is done using the inner
-	/// CRDT's merge operation. This is usefull in the case where the inner CRDT is a large
+	/// CRDT's merge operation. This is useful in the case where the inner CRDT is a large
 	/// data type, such as a map, and we only want to change a single item in the map.
 	/// To do this, we can produce a "CRDT delta", i.e. a LWW that contains only the modification.
 	/// This delta consists in a LWW with the same timestamp, and the map

src/util/crdt/lww_map.rs

@@ -109,7 +109,7 @@ where
 	}
 
 	/// Takes all of the values of the map and returns them. The current map is reset to the
-	/// empty map. This is very usefull to produce in-place a new map that contains only a delta
+	/// empty map. This is very useful to produce in-place a new map that contains only a delta
 	/// that modifies a certain value:
 	///
 	/// ```ignore
@@ -162,7 +162,7 @@ where
 		}
 	}
 
-	/// Gets a reference to all of the items, as a slice. Usefull to iterate on all map values.
+	/// Gets a reference to all of the items, as a slice. Useful to iterate on all map values.
 	/// In most case you will want to ignore the timestamp (second item of the tuple).
 	pub fn items(&self) -> &[(K, u64, V)] {
 		&self.vals[..]

src/util/crdt/map.rs

@@ -57,7 +57,7 @@ where
 			Err(_) => None,
 		}
 	}
-	/// Gets a reference to all of the items, as a slice. Usefull to iterate on all map values.
+	/// Gets a reference to all of the items, as a slice. Useful to iterate on all map values.
 	pub fn items(&self) -> &[(K, V)] {
 		&self.vals[..]
 	}

src/util/encode.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-/// Serialize to MessagePacki, without versionning
+/// Serialize to MessagePack, without versioning
-/// (see garage_util::migrate for functions that manage versionned
+/// (see garage_util::migrate for functions that manage versioned
 /// data formats)
 pub fn nonversioned_encode<T>(val: &T) -> Result<Vec<u8>, rmp_serde::encode::Error>
 where
@@ -13,8 +13,8 @@ where
 	Ok(wr)
 }
 
-/// Deserialize from MessagePacki, without versionning
+/// Deserialize from MessagePack, without versioning
-/// (see garage_util::migrate for functions that manage versionned
+/// (see garage_util::migrate for functions that manage versioned
 /// data formats)
 pub fn nonversioned_decode<T>(bytes: &[u8]) -> Result<T, rmp_serde::decode::Error>
 where