add internals for supporting transactional updates

chore: update cmd parameter name in shell.nix
should fix the warning : WARN[0000] Flag --customPlatform is deprecated. Use: --custom-platform
2026-08-13 23:56:53 +00:00 · 2026-02-07 13:26:56 +01:00 · 2026-01-29 22:14:34 +00:00 · 2026-01-29 20:50:05 +01:00 · 2026-01-29 20:50:05 +01:00 · 2026-01-29 20:50:05 +01:00
230 changed files with 5595 additions and 2763 deletions
@@ -1,3 +1,6 @@
+labels:
+  nix: "enabled"
+
 when:
  event:
  - push
@@ -9,27 +12,42 @@ when:

 steps:
  - name: check formatting
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
-      - nix-shell --attr devShell --run "cargo fmt -- --check"
+      - nix-build -j4 --attr flakePackages.fmt
+
+  - name: check typos
+    image: nixpkgs/nix:nixos-24.05
+    commands:
+      - nix-shell --attr ci --run typos
+
+  - name: check lints with clippy
+    image: nixpkgs/nix:nixos-24.05
+    commands:
+      - nix-build -j4 --attr flakePackages.clippy

  - name: build
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-build -j4 --attr flakePackages.dev

  - name: unit + func tests (lmdb)
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-build -j4 --attr flakePackages.tests-lmdb

  - name: unit + func tests (sqlite)
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-build -j4 --attr flakePackages.tests-sqlite

+  - name: unit + func tests (fjall)
+    image: nixpkgs/nix:nixos-24.05
+    commands:
+      - nix-build -j4 --attr flakePackages.tests-fjall
+
  - name: integration tests
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-build -j4 --attr flakePackages.dev
      - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
@@ -1,3 +1,6 @@
+labels:
+  nix: "enabled"
+
 when:
  event:
  - deployment
@@ -8,7 +11,7 @@ depends_on:

 steps:
  - name: refresh-index
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    environment:
      AWS_ACCESS_KEY_ID:
        from_secret: garagehq_aws_access_key_id
@@ -19,7 +22,7 @@ steps:
      - nix-shell --attr ci --run "refresh_index"

  - name: multiarch-docker
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    environment:
      DOCKER_AUTH:
        from_secret: docker_auth
@@ -1,3 +1,6 @@
+labels:
+  nix: "enabled"
+
 when:
  event:
  - deployment
@@ -16,17 +19,17 @@ matrix:

 steps:
  - name: build
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-build --attr releasePackages.${ARCH} --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA}

  - name: check is static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-shell --attr ci --run "./script/not-dynamic.sh result/bin/garage"

  - name: integration tests
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-shell --attr ci --run ./script/test-smoke.sh || (cat /tmp/garage.log; false)
    when:
@@ -36,7 +39,7 @@ steps:
          ARCH: i386

  - name: upgrade tests from v1.0.0
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-shell --attr ci --run "./script/test-upgrade.sh v1.0.0 x86_64-unknown-linux-musl" || (cat /tmp/garage.log; false)
    when:
@@ -44,7 +47,7 @@ steps:
          ARCH: amd64

  - name: upgrade tests from v0.8.4
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    commands:
      - nix-shell --attr ci --run "./script/test-upgrade.sh v0.8.4 x86_64-unknown-linux-musl" || (cat /tmp/garage.log; false)
    when:
@@ -52,7 +55,7 @@ steps:
          ARCH: amd64

  - name: push static binary
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    environment:
      TARGET: "${TARGET}"
      AWS_ACCESS_KEY_ID:
@@ -63,7 +66,7 @@ steps:
      - nix-shell --attr ci --run "to_s3"

  - name: docker build and publish
-    image: nixpkgs/nix:nixos-22.05
+    image: nixpkgs/nix:nixos-24.05
    environment:
      DOCKER_PLATFORM: "linux/${ARCH}"
      CONTAINER_NAME: "dxflrs/${ARCH}_garage"
@@ -24,22 +24,22 @@ default-members = ["src/garage"]

 # Internal Garage crates
 format_table = { version = "0.1.1", path = "src/format-table" }
-garage_api_common = { version = "2.0.0", path = "src/api/common" }
-garage_api_admin = { version = "2.0.0", path = "src/api/admin" }
-garage_api_s3 = { version = "2.0.0", path = "src/api/s3" }
-garage_api_k2v = { version = "2.0.0", path = "src/api/k2v" }
-garage_block = { version = "2.0.0", path = "src/block" }
-garage_db = { version = "2.0.0", path = "src/db", default-features = false }
-garage_model = { version = "2.0.0", path = "src/model", default-features = false }
-garage_net = { version = "2.0.0", path = "src/net" }
-garage_rpc = { version = "2.0.0", path = "src/rpc" }
-garage_table = { version = "2.0.0", path = "src/table" }
-garage_util = { version = "2.0.0", path = "src/util" }
-garage_web = { version = "2.0.0", path = "src/web" }
+garage_api_common = { version = "2.2.0", path = "src/api/common" }
+garage_api_admin = { version = "2.2.0", path = "src/api/admin" }
+garage_api_s3 = { version = "2.2.0", path = "src/api/s3" }
+garage_api_k2v = { version = "2.2.0", path = "src/api/k2v" }
+garage_block = { version = "2.2.0", path = "src/block" }
+garage_db = { version = "2.2.0", path = "src/db", default-features = false }
+garage_model = { version = "2.2.0", path = "src/model", default-features = false }
+garage_net = { version = "2.2.0", path = "src/net" }
+garage_rpc = { version = "2.2.0", path = "src/rpc" }
+garage_table = { version = "2.2.0", path = "src/table" }
+garage_util = { version = "2.2.0", path = "src/util" }
+garage_web = { version = "2.2.0", path = "src/web" }
 k2v-client = { version = "0.0.4", path = "src/k2v-client" }

 # External crates from crates.io
-arc-swap = "1.0"
+arc-swap = "1.1"
 argon2 = "0.5"
 async-trait = "0.1.7"
 backtrace = "0.3"
@@ -49,9 +49,8 @@ bytes = "1.0"
 bytesize = "1.1"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
-crc-fast = "1.1"
+crc-fast = "1.6"
 crypto-common = "0.1"
-err-derive = "0.3"
 gethostname = "0.4"
 git-version = "0.3.4"
 hex = "0.4"
@@ -64,6 +63,7 @@ md-5 = "0.10"
 mktemp = "0.5"
 nix = { version = "0.29", default-features = false, features = ["fs"] }
 nom = "7.1"
+parking_lot = "0.12"
 parse_duration = "2.1"
 paste = "1.0"
 pin-project = "1.0.12"
@@ -87,14 +87,15 @@ tracing-journald = "0.3.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

 heed = { version = "0.11", default-features = false, features = ["lmdb"] }
-rusqlite = "0.31.0"
+rusqlite = "0.37"
 r2d2 = "0.8"
-r2d2_sqlite = "0.24"
+r2d2_sqlite = "0.31"
+fjall = "2.4"

 async-compression = { version = "0.4", features = ["tokio", "zstd"] }
 zstd = { version = "0.13", default-features = false }

-quick-xml = { version = "0.26", features = [ "serialize" ] }
+quick-xml = { version = "0.26", features = ["serialize"] }
 rmp-serde = "1.1.2"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_bytes = "0.11"
@@ -114,7 +115,7 @@ httpdate = "1.0"
 http-range = "0.1"
 http-body-util = "0.1"
 hyper = { version = "1.0", default-features = false }
-hyper-util = { version = "0.1", features = [ "full" ] }
+hyper-util = { version = "0.1", features = ["full"] }
 multer = "3.0"
 percent-encoding = "2.2"
 roxmltree = "0.19"
@@ -122,11 +123,11 @@ url = "2.3"

 futures = "0.3"
 futures-util = "0.3"
-tokio = { version = "1.0", default-features = false, features = ["net", "rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
+tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
 tokio-util = { version = "0.7", features = ["compat", "io"] }
 tokio-stream = { version = "0.1", features = ["net"] }

-opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] }
+opentelemetry = { version = "0.17", features = ["rt-tokio", "metrics", "trace"] }
 opentelemetry-prometheus = "0.10"
 opentelemetry-otlp = "0.10"
 opentelemetry-contrib = "0.9"
@@ -136,7 +137,7 @@ prometheus = "0.13"
 aws-sigv4 = { version = "1.1", default-features = false }
 hyper-rustls = { version = "0.26", default-features = false, features = ["http1", "http2", "ring", "rustls-native-certs"] }
 log = "0.4"
-thiserror = "1.0"
+thiserror = "2.0"

 # ---- used only as build / dev dependencies ----
 assert-json-diff = "2.0"
@@ -153,5 +154,5 @@ lto = "off"
 [profile.release]
 lto = true
 codegen-units = 1
-opt-level = "s"
+opt-level = 3
 strip = true
@@ -3,10 +3,10 @@ info:
  version: v0.8.0
  title: Garage Administration API v0+garage-v0.8.0
  description: |
-    Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks.
-    
-    *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!*
-paths: 
+    Administrate your Garage cluster programmatically, including status, layout, keys, buckets, and maintenance tasks.
+
+    *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionally, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!*
+paths:
  /status:
    get:
      tags: 
@@ -3,10 +3,10 @@ info:
  version: v0.9.0
  title: Garage Administration API v0+garage-v0.9.0
  description: |
-    Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks.
-    
-    *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!*
-paths: 
+    Administrate your Garage cluster programmatically, including status, layout, keys, buckets, and maintenance tasks.
+
+    *Disclaimer: The API is not stable yet, hence its v0 tag. The API can change at any time, and changes can include breaking backward compatibility. Read the changelog and upgrade your scripts before upgrading. Additionally, this specification is very early stage and can contain bugs, especially on error return codes/types that are not tested yet. Do not expect a well finished and polished product!*
+paths:
  /health:
    get:
      tags:
@@ -440,7 +440,7 @@ paths:
              - "false"
          example: "true"
          required: false
-          description: "Wether or not the secret key should be returned in the response"
+          description: "Whether or not the secret key should be returned in the response"
      responses:
        '500':
          description: "The server can not handle your request. Check your connectivity with the rest of the cluster."
@@ -2,7 +2,7 @@
  "openapi": "3.1.0",
  "info": {
    "title": "Garage administration API",
-    "description": "Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks.\n\n*Disclaimer: This API may change in future Garage versions. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is early stage and can contain bugs, so be careful and please report any issues on our issue tracker.*",
+    "description": "Administrate your Garage cluster programmatically, including status, layout, keys, buckets, and maintenance tasks.\n\n*Disclaimer: This API may change in future Garage versions. Read the changelog and upgrade your scripts before upgrading. Additionally, this specification is early stage and can contain bugs, so be careful and please report any issues on our issue tracker.*",
    "contact": {
      "name": "The Garage team",
      "url": "https://garagehq.deuxfleurs.fr/",
@@ -12,7 +12,7 @@
      "name": "AGPL-3.0",
      "identifier": "AGPL-3.0"
    },
-    "version": "v2.0.0"
+    "version": "v2.2.0"
  },
  "servers": [
    {
@@ -31,9 +31,12 @@
        "parameters": [
          {
            "name": "domain",
-            "in": "path",
+            "in": "query",
            "description": "The domain name to check for",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -100,7 +103,7 @@
          "content": {
            "application/json": {
              "schema": {
-                "$ref": "#/components/schemas/AddBucketAliasRequest"
+                "$ref": "#/components/schemas/BucketAliasEnum"
              }
            }
          },
@@ -405,9 +408,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -437,9 +443,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Admin API token ID",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -462,9 +471,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "ID of the bucket to delete",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -493,9 +505,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Access key ID",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -552,26 +567,20 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Admin API token ID",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          },
          {
            "name": "search",
-            "in": "path",
+            "in": "query",
            "description": "Partial token ID or name to search for",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          }
        ],
@@ -602,9 +611,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -644,38 +656,29 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Exact bucket ID to look up",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          },
          {
            "name": "globalAlias",
-            "in": "path",
+            "in": "query",
            "description": "Global alias of bucket to look up",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          },
          {
            "name": "search",
-            "in": "path",
+            "in": "query",
            "description": "Partial ID or alias to search for",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          }
        ],
@@ -813,6 +816,30 @@
        }
      }
    },
+    "/v2/GetCurrentAdminTokenInfo": {
+      "get": {
+        "tags": [
+          "Admin API token"
+        ],
+        "description": "\nReturn information about the calling admin API token.\n    ",
+        "operationId": "GetCurrentAdminTokenInfo",
+        "responses": {
+          "200": {
+            "description": "Information about the admin token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetCurrentAdminTokenInfoResponse"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal server error"
+          }
+        }
+      }
+    },
    "/v2/GetKeyInfo": {
      "get": {
        "tags": [
@@ -823,33 +850,27 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Access key ID",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          },
          {
            "name": "search",
-            "in": "path",
+            "in": "query",
            "description": "Partial key ID or name to search for",
-            "required": true,
+            "required": false,
            "schema": {
-              "type": [
-                "string",
-                "null"
-              ]
+              "type": "string"
            }
          },
          {
            "name": "showSecretKey",
-            "in": "path",
+            "in": "query",
            "description": "Whether to return the secret access key",
-            "required": true,
+            "required": false,
            "schema": {
              "type": "boolean"
            }
@@ -882,9 +903,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -914,9 +938,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -946,9 +973,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -988,9 +1018,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1064,7 +1097,7 @@
        "parameters": [
          {
            "name": "bucketId",
-            "in": "path",
+            "in": "query",
            "required": true,
            "schema": {
              "type": "string"
@@ -1072,7 +1105,7 @@
          },
          {
            "name": "key",
-            "in": "path",
+            "in": "query",
            "required": true,
            "schema": {
              "type": "string"
@@ -1109,9 +1142,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1175,9 +1211,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "responses": {
@@ -1255,9 +1294,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1321,9 +1363,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1364,7 +1409,7 @@
          "content": {
            "application/json": {
              "schema": {
-                "$ref": "#/components/schemas/RemoveBucketAliasRequest"
+                "$ref": "#/components/schemas/BucketAliasEnum"
              }
            }
          },
@@ -1397,9 +1442,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1463,9 +1511,12 @@
        "parameters": [
          {
            "name": "node",
-            "in": "path",
+            "in": "query",
            "description": "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1505,9 +1556,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Admin API token ID",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1547,9 +1601,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "ID of the bucket to update",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1627,9 +1684,12 @@
        "parameters": [
          {
            "name": "id",
-            "in": "path",
+            "in": "query",
            "description": "Access key ID",
-            "required": true
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
          }
        ],
        "requestBody": {
@@ -1662,24 +1722,6 @@
  },
  "components": {
    "schemas": {
-      "AddBucketAliasRequest": {
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/BucketAliasEnum"
-          },
-          {
-            "type": "object",
-            "required": [
-              "bucketId"
-            ],
-            "properties": {
-              "bucketId": {
-                "type": "string"
-              }
-            }
-          }
-        ]
-      },
      "AddBucketAliasResponse": {
        "$ref": "#/components/schemas/GetBucketInfoResponse"
      },
@@ -1897,9 +1939,13 @@
          {
            "type": "object",
            "required": [
+              "bucketId",
              "globalAlias"
            ],
            "properties": {
+              "bucketId": {
+                "type": "string"
+              },
              "globalAlias": {
                "type": "string"
              }
@@ -1908,6 +1954,7 @@
          {
            "type": "object",
            "required": [
+              "bucketId",
              "localAlias",
              "accessKeyId"
            ],
@@ -1915,6 +1962,9 @@
              "accessKeyId": {
                "type": "string"
              },
+              "bucketId": {
+                "type": "string"
+              },
              "localAlias": {
                "type": "string"
              }
@@ -2344,7 +2394,7 @@
          },
          "websiteAccess": {
            "type": "boolean",
-            "description": "Whether website acces is enabled for this bucket"
+            "description": "Whether website access is enabled for this bucket"
          },
          "websiteConfig": {
            "oneOf": [
@@ -2383,7 +2433,7 @@
          "knownNodes",
          "connectedNodes",
          "storageNodes",
-          "storageNodesOk",
+          "storageNodesUp",
          "partitions",
          "partitionsQuorum",
          "partitionsAllOk"
@@ -2391,7 +2441,7 @@
        "properties": {
          "connectedNodes": {
            "type": "integer",
-            "description": "the nubmer of nodes this Garage node currently has an open connection to",
+            "description": "the number of nodes this Garage node currently has an open connection to",
            "minimum": 0
          },
          "knownNodes": {
@@ -2423,7 +2473,7 @@
            "description": "the number of storage nodes currently registered in the cluster layout",
            "minimum": 0
          },
-          "storageNodesOk": {
+          "storageNodesUp": {
            "type": "integer",
            "description": "the number of storage nodes to which a connection is currently open",
            "minimum": 0
@@ -2558,6 +2608,9 @@
          }
        }
      },
+      "GetCurrentAdminTokenInfoResponse": {
+        "$ref": "#/components/schemas/GetAdminTokenInfoResponse"
+      },
      "GetKeyInfoResponse": {
        "type": "object",
        "required": [
@@ -3849,6 +3902,46 @@
          }
        ]
      },
+      "NodeRoleChangeRequest": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "id",
+              "remove"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "ID of the node for which this change applies"
+              },
+              "remove": {
+                "type": "boolean",
+                "description": "Set `remove` to `true` to remove the node from the layout"
+              }
+            }
+          },
+          {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/NodeAssignedRole"
+              },
+              {
+                "type": "object",
+                "required": [
+                  "id"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string",
+                    "description": "ID of the node for which this change applies"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
      "NodeUpdateTrackers": {
        "type": "object",
        "required": [
@@ -3910,24 +4003,6 @@
          }
        ]
      },
-      "RemoveBucketAliasRequest": {
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/BucketAliasEnum"
-          },
-          {
-            "type": "object",
-            "required": [
-              "bucketId"
-            ],
-            "properties": {
-              "bucketId": {
-                "type": "string"
-              }
-            }
-          }
-        ]
-      },
      "RemoveBucketAliasResponse": {
        "$ref": "#/components/schemas/GetBucketInfoResponse"
      },
@@ -3991,6 +4066,12 @@
            "enum": [
              "aliases"
            ]
+          },
+          {
+            "type": "string",
+            "enum": [
+              "clearResyncQueue"
+            ]
          }
        ]
      },
@@ -4111,7 +4192,7 @@
          "roles": {
            "type": "array",
            "items": {
-              "$ref": "#/components/schemas/NodeRoleChange"
+              "$ref": "#/components/schemas/NodeRoleChangeRequest"
            },
            "description": "New node roles to assign or remove in the cluster layout"
          }
@@ -51,4 +51,4 @@ We are currently building this SDK for [Python](@/documentation/build/python.md#

 More information:
  - [In the reference manual](@/documentation/reference-manual/admin-api.md)
-  - [Full specifiction](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.html)
+  - [Full specification](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.html)
@@ -5,13 +5,13 @@ weight = 99

 ## S3

-If you are developping a new application, you may want to use Garage to store your user's media.
+If you are developing a new application, you may want to use Garage to store your user's media.

 The S3 API that Garage uses is a standard REST API, so as long as you can make HTTP requests,
 you can query it. You can check the [S3 REST API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Operations_Amazon_Simple_Storage_Service.html) from Amazon to learn more.

-Developping your own wrapper around the REST API is time consuming and complicated.
-Instead, there are some libraries already avalaible.
+Developing your own wrapper around the REST API is time consuming and complicated.
+Instead, there are some libraries already available.

 Some of them are maintained by Amazon, some by Minio, others by the community.

@@ -23,7 +23,7 @@ To configure S3-compatible software to interact with Garage,
 you will need the following parameters:

 - An **API endpoint**: this corresponds to the HTTP or HTTPS address
-  used to contact the Garage server. When runing Garage locally this will usually
+  used to contact the Garage server. When running Garage locally this will usually
  be `http://127.0.0.1:3900`. In a real-world setting, you would usually have a reverse-proxy
  that adds TLS support and makes your Garage server available under a public hostname
  such as `https://garage.example.com`.
@@ -12,8 +12,9 @@ In this section, we cover the following web applications:
 | [Mastodon](#mastodon)     | ✅       | Natively supported    |
 | [Matrix](#matrix)     | ✅       |  Tested with `synapse-s3-storage-provider`    |
 | [ejabberd](#ejabberd)     | ✅       |  `mod_s3_upload`    |
-| [Pixelfed](#pixelfed)     | ❓       |  Not yet tested    |
-| [Pleroma](#pleroma)     | ❓       |  Not yet tested    |
+| [Ente](#ente)     | ✅       |  Natively supported |
+| [Pixelfed](#pixelfed)     | ❓       |  Natively supported    |
+| [Pleroma](#pleroma)     | ✅        |  Natively supported    |
 | [Lemmy](#lemmy)     | ✅        |  Supported with pict-rs    |
 | [Funkwhale](#funkwhale)     | ❓       | Not yet tested     |
 | [Misskey](#misskey)     | ❓       | Not yet tested     |
@@ -53,7 +54,7 @@ garage bucket allow nextcloud --read --write --key nextcloud-key

 Now edit your Nextcloud configuration file to enable object storage.
 On my installation, the config. file is located at the following path: `/var/www/nextcloud/config/config.php`.  
-We will add a new root key to the `$CONFIG` dictionnary named `objectstore`:
+We will add a new root key to the `$CONFIG` dictionary named `objectstore`:

 ```php
 <?php
@@ -191,10 +192,10 @@ garage key create peertube-key

 Keep the Key ID and the Secret key in a pad, they will be needed later.  

-We need two buckets, one for normal videos (named peertube-video) and one for webtorrent videos (named peertube-playlist).
+We need two buckets, one for normal videos (named peertube-videos) and one for webtorrent videos (named peertube-playlists).
 ```bash
 garage bucket create peertube-videos
-garage bucket create peertube-playlist
+garage bucket create peertube-playlists
 ```

 Now we allow our key to read and write on these buckets:
@@ -253,7 +254,7 @@ object_storage:
    proxify_private_files: false

  streaming_playlists:
-    bucket_name: 'peertube-playlist'
+    bucket_name: 'peertube-playlists'

    # Keep it empty for our example
    prefix: ''
@@ -412,7 +413,7 @@ mc mirror --newer-than "3h" ./public/system/ garage/mastodon-data

 ## Matrix

-Matrix is a chat communication protocol. Its main stable server implementation, [Synapse](https://matrix-org.github.io/synapse/latest/), provides a module to store media on a S3 backend. Additionally, a server independent media store supporting S3 has been developped by the community, it has been made possible thanks to how the matrix API has been designed and will work with implementations like Conduit, Dendrite, etc.
+Matrix is a chat communication protocol. Its main stable server implementation, [Synapse](https://matrix-org.github.io/synapse/latest/), provides a module to store media on a S3 backend. Additionally, a server independent media store supporting S3 has been developed by the community, it has been made possible thanks to how the matrix API has been designed and will work with implementations like Conduit, Dendrite, etc.

 ### synapse-s3-storage-provider (synapse only)

@@ -449,7 +450,7 @@ media_storage_providers:

 Note that uploaded media will also be stored locally and this behavior can not be deactivated, it is even required for
 some operations like resizing images.
-In fact, your local filesysem is considered as a cache but without any automated way to garbage collect it.
+In fact, your local filesystem is considered as a cache but without any automated way to garbage collect it.

 We can build our garbage collector with `s3_media_upload`, a tool provided with the module.
 If you installed the module with the command provided before, you should be able to bring it in your path:
@@ -567,13 +568,186 @@ The module can then be configured with:
 Other configuration options can be found in the
 [configuration YAML file](https://github.com/processone/ejabberd-contrib/blob/master/mod_s3_upload/conf/mod_s3_upload.yml).

+
+## Ente
+
+Ente is an alternative for Google Photos and Apple Photos. It [can be selfhosted](https://help.ente.io/self-hosting/) and is working fine with Garage as of May 2024.
+As a first step we need to create a bucket and a key for Ente:
+
+```bash
+garage bucket create ente
+garage key create ente-key
+# For the CORS setup to work, the key needs to be --owner as well, at least temporarily.
+garage bucket allow ente --read --write --owner --key ente-key
+```
+
+We also need to setup some CORS rules to allow the Ente frontend to access the bucket:
+
+```bash
+export CORS='{"CORSRules":[{"AllowedHeaders":["*"],"AllowedMethods":["GET", "PUT", "POST", "DELETE"],"AllowedOrigins":["*"], "ExposeHeaders":["ETag"]}]}'
+aws s3api put-bucket-cors --bucket ente --cors-configuration $CORS
+```
+
+Now we need to configure ente-server to use our bucket. This is explained [in the Ente S3 documentation](https://help.ente.io/self-hosting/guides/external-s3).
+Prepare a configuration file for ente's backend as `museum.yaml`:
+
+```yaml
+credentials-file: /credentials.yaml
+apps:
+  public-albums: https://albums.example.tld # If you want to use the share album feature
+    internal:
+hardcoded-ott:
+  local-domain-suffix: "@example.com" # Your domain
+  local-domain-value: 123456 # Custom One-Time Password since we are not sending mail by default
+key:
+  # WARNING -- You MUST CHANGE the values below
+  # Someone has made an image that can do it for you : https://github.com/EdyTheCow/ente-selfhost/blob/main/images/ente-server-tools/Dockerfile
+  # Simply build it yourself or run docker run --rm ghcr.io/edythecow/ente-server-tools go run tools/gen-random-keys/main.go
+  encryption: yvmG/RnzKrbCb9L3mgsmoxXr9H7i2Z4qlbT0mL3ln4w= # CHANGE THIS VALUE
+  hash: KXYiG07wC7GIgvCSdg+WmyWdXDAn6XKYJtp/wkEU7x573+byBRAYtpTP0wwvi8i/4l37uicX1dVTUzwH3sLZyw== # CHANGE THIS VALUE
+jwt:
+  secret: i2DecQmfGreG6q1vBj5tCokhlN41gcfS2cjOs9Po-u8= # CHANGE THIS VALUE
+```
+
+The full configuration file can be found [here](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
+Then prepare a credentials file as `credentials.yaml`
+
+```yaml
+db:
+    host: postgres
+    port: 5432
+    name: <ente_db_name>
+    user: <pguser>
+    password: <pgpass>
+
+s3:
+    # Override the primary and secondary hot storage. The commented out values
+    # are the defaults.
+    #
+    hot_storage:
+        primary: b2-eu-cen
+    #    secondary: wasabi-eu-central-2-v3
+
+    # If true, enable some workarounds to allow us to use a local minio instance
+    # for object storage.
+    #
+    # 1. Disable SSL.
+    # 2. Use "path" style S3 URLs (see `use_path_style_urls` below).
+    # 3. Directly download the file during replication instead of going via the
+    #    Cloudflare worker.
+    # 4. Do not specify storage classes when uploading objects (since minio does
+    #    not support them, specifically it doesn't support GLACIER).
+    are_local_buckets: true
+
+    # To use "path" style S3 URLs instead of DNS-based bucket access
+    # default to true if you set "are_local_buckets: true"
+    # use_path_style_urls: true
+
+    b2-eu-cen: # Don't change this key, it is hardcoded
+        key: <keyID> 
+        secret: <keySecret>
+        endpoint: garage:3900 # publicly accessible endpoint of your garage instance
+        region: garage
+        bucket: <yourbucketName>
+        use_path_style: true
+    # you can specify secondary locations, names are hardcoded as well
+    # wasabi-eu-central-2-v3:
+    # scw-eu-fr-v3:
+    
+    # and you can also specify a bucket to be used for embeddings, preview etc..
+    # default to the first bucket 
+    # derived-storage: wasabi-eu-central-2-derived
+```
+
+Finally you can run it with Docker : 
+
+```bash
+docker run -d --name ente-server --restart unless-stopped -v /path/to/museum.yaml:/museum.yaml -v /path/to/credentials.yaml:/credentials.yaml -p 8080:8080 ghcr.io/ente-io/ente-server
+```
+
+For more information on deployment you can check the [ente documentation](https://help.ente.io/self-hosting/)
+
 ## Pixelfed

 [Pixelfed Technical Documentation > Configuration](https://docs.pixelfed.org/technical-documentation/env.html#filesystem)

 ## Pleroma

-[Pleroma Documentation > Pleroma.Uploaders.S3](https://docs-develop.pleroma.social/backend/configuration/cheatsheet/#pleromauploaderss3)
+### Creating your bucket
+
+This is the usual Garage setup:
+
+```bash
+garage key new --name pleroma-key
+garage bucket create pleroma
+garage bucket allow pleroma --read --write --owner --key pleroma-key
+```
+
+We also need to expose these buckets publicly to serve their content to users:
+
+```bash
+garage bucket website --allow pleroma
+```
+
+Note the Key ID and Secret Key.
+
+### Configure Pleroma
+
+Update your Pleroma configuration like that in `/etc/pleroma/config.exs`.
+
+```
+config :pleroma, Pleroma.Upload,
+    uploader: Pleroma.Uploaders.S3,
+    base_url: "https://pleroma.garage.example.tld"
+
+config :ex_aws, :s3,
+    access_key_id: "GW...",
+    secret_access_key: "XXX",
+    region: "garage",
+    host: "api.garage.example.tld"
+```
+
+And restart Pleroma.
+
+You can found more information in [Pleroma Documentation > Pleroma.Uploaders.S3](https://docs-develop.pleroma.social/backend/configuration/cheatsheet/#pleromauploaderss3)
+
+### Migrating your data
+
+Pleroma have an internal migration tool that can encounter some fatal error
+
+```
+** (EXIT from #PID<0.98.0>) an exception was raised:
+    ** (File.Error) could not stream "/var/lib/pleroma/uploads/09/f8": illegal operation on a directory
+        (elixir 1.17.3) lib/file/stream.ex:100: anonymous fn/3 in Enumerable.File.Stream.reduce/3
+        (elixir 1.17.3) lib/stream.ex:1675: anonymous fn/5 in Stream.resource/3
+        (elixir 1.17.3) lib/stream.ex:1891: Enumerable.Stream.do_each/4
+        (elixir 1.17.3) lib/task/supervised.ex:370: Task.Supervised.stream_reduce/7
+        (elixir 1.17.3) lib/enum.ex:4423: Enum.map/2
+        (ex_aws_s3 2.5.8) lib/ex_aws/s3/upload.ex:141: ExAws.Operation.ExAws.S3.Upload.perform/2
+        (pleroma 2.10.0) lib/pleroma/uploaders/s3.ex:60: Pleroma.Uploaders.S3.put_file/1
+        (pleroma 2.10.0) lib/pleroma/uploaders/uploader.ex:49: Pleroma.Uploaders.Uploader.put_file/2
+```
+
+So, use [your best tool](https://garagehq.deuxfleurs.fr/documentation/connect/cli/) to sync `/var/lib/pleroma/uploads/` in your S3.
+
+Then, to avoid some non existent problem (just in case of), run this command
+
+```bash
+while true
+do
+    rm -vr $(./bin/pleroma_ctl uploads migrate_local S3 2>&1 | grep "could not stream" | awk -F '"' '{print $2}')
+    sleep 5
+done
+```
+
+If you have many files, stop this command sometime and the command bellow (interactive) to delete local
+file after upload. Then restart the loop.
+
+```bash
+./bin/pleroma_ctl uploads migrate_local S3 --delete
+```
+
+And *voilà*

 ## Lemmy

@@ -161,3 +161,59 @@ kopia repository validate-provider

 You can then run all the standard kopia commands: `kopia snapshot create`, `kopia mount`...
 Everything should work out-of-the-box.
+
+## Plakar
+
+Create your key and bucket on Garage server:
+
+```bash
+garage key create my-plakar-key
+garage bucket create plakar-backups
+garage bucket allow plakar-backups --read --write --key my-plakar-key
+…
+```
+
+On Plakar server, add your Garage as a storage location:
+```bash
+plakar store add garageS3 s3://my-garage.tld/plakar-backups \
+region=garage # Or as you've specified in garage.toml \
+access_key=<Key ID from "garage key info my-plakar-key"> \
+secret_access_key=<Secret key from "garage key info my-plakar-key">
+```
+
+Then create the repository.
+```bash
+plakar at @garageS3 create -plaintext # Unencrypted
+# or
+plakar at @garageS3 create #encrypted
+```
+
+If you encrypt your backups (Plakar default), you will need to define a strong passphrase. Do not forget to save your password safely. It will be needed to decrypt your backups.
+
+
+After the repository has been created, check that everything works as expected (that might give an empty result as no file has been added yet, but no error message):
+```bash
+plakar at @garageS3 check
+```
+
+Now that everything is configure, you can use Garage as your backups storage. For instance sync it with a local backup storage:
+```bash
+$ plakar at ~/backups sync to @garageS3
+```
+
+Or list the S3 storage content:
+```bash
+$ plakar at @garageS3 ls
+```
+
+More information in Plakar documentation: https://www.plakar.io/docs/main/quickstart/
+
+## Synology HyperBackup
+
+HyperBackup can be configured to upload backups to garage using a custom S3 destination. However, the HyperBackup client hardcodes the `us-east-1` region that is a critical input to the v4 signature process. If garage is not set to `us-east-1`, HyperBackup will recognize available buckets, but fail during the final setup stage.
+
+In garage.toml:
+```toml
+[s3_api]
+s3_region = "us-east-1"
+```
@@ -41,7 +41,7 @@ Some commands:
 # list buckets
 mc ls garage/

-# list objets in a bucket
+# list objects in a bucket
 mc ls garage/my_files

 # copy from your filesystem to garage
@@ -149,6 +149,15 @@ rclone help
 This will tremendously accelerate operations such as `rclone sync` or `rclone ncdu` by reducing the number
 of ListObjects calls that are made.

+**Garage behind Cloudflare proxy:** when running Garage behind Cloudflare proxy, you might see `Response: error 403 Forbidden, Forbidden: Invalid signature` error in your garage logs or `AccessDenied: Forbidden: Invalid signature` error in rclone logs. Try adding `--s3-sign-accept-encoding=false` flag to your rclone command and see if the issue is resolved.
+
+```bash
+# this throws an error
+rclone lsd garage:
+
+# this should work
+rclone lsd --s3-sign-accept-encoding=false garage:
+```

 ## `s3cmd`

@@ -209,7 +218,7 @@ Within Cyberduck, a
 available within the `Preferences -> Profiles` section. This can enabled and
 then connections to Garage may be configured.

-### Instuctions for the CLI
+### Instructions for the CLI

 To configure duck (Cyberduck's CLI tool), start by creating its folder hierarchy:

@@ -314,4 +323,3 @@ ls
 ```

 And through the web interface at http://[::1]:8080/web/client
-
@@ -201,11 +201,9 @@ on the binary cache, the client will download the result from the cache instead

 ### Channels

-Channels additionnaly serve Nix definitions, ie. a `.nix` file referencing
+Channels additionally serve Nix definitions, ie. a `.nix` file referencing
 all the derivations you want to serve.

 ## Gitlab

 *External link:* [Gitlab Documentation > Object storage](https://docs.gitlab.com/ee/administration/object_storage.html)
-
-
@@ -8,12 +8,12 @@ have published Ansible roles.  We list them and compare them below.

 ## Comparison of Ansible roles

-| Feature                            | [ansible-role-garage](#zorun-ansible-role-garage) | [garage-docker-ansible-deploy](#moan0s-garage-docker-ansible-deploy) | [eddster ansible-role-garage](#eddster-ansible-role-garage) |
+| Feature                            | [ansible-role-garage](#zorun-ansible-role-garage) | [garage-docker-ansible-deploy](#moan0s-garage-docker-ansible-deploy) | [eddster2309 ansible-role-garage](#eddster2309-ansible-role-garage) |
 |------------------------------------|---------------------------------------------|---------------------------------------------------------------|---------------------------------|
 | **Runtime**                        | Systemd                                     | Docker                                                        | Systemd                         |
 | **Target OS**                      | Any Linux                                   | Any Linux                                                     | Any Linux                       |
 | **Architecture**                   | amd64, arm64, i686                          | amd64, arm64                                                  | arm64, arm, 386, amd64                            |
-| **Additional software**            | None                                        | Traefik                                                       | Ngnix and Keepalived (optional) |
+| **Additional software**            | None                                        | Traefik                                                       | Nginx and Keepalived (optional) |
 | **Automatic node connection**      | ❌                                          | ✅                                                            | ✅                              |
 | **Layout management**              | ❌                                          | ✅                                                            | ✅                              |
 | **Manage buckets & keys**          | ❌                                          | ✅ (basic)                                                    | ✅                              |
@@ -15,9 +15,10 @@ Alpine Linux repositories (available since v3.17):
 apk add garage
 ```

-The default configuration file is installed to `/etc/garage.toml`. You can run
-Garage using: `rc-service garage start`. If you don't specify `rpc_secret`, it
-will be automatically replaced with a random string on the first start.
+The default configuration file is installed to `/etc/garage/garage.toml`. You can run
+Garage using: `rc-service garage start`.
+
+If you don't specify `rpc_secret`, it will be automatically replaced with a random string on the first start.

 Please note that this package is built without Consul discovery, Kubernetes
 discovery, OpenTelemetry exporter, and K2V features (K2V will be enabled once
@@ -26,7 +27,11 @@ it's stable).

 ## Arch Linux

-Garage is available in the [AUR](https://aur.archlinux.org/packages/garage).
+Garage is available in the official repositories under [extra](https://archlinux.org/packages/extra/x86_64/garage).
+
+```bash
+pacman -S garage
+```

 ## FreeBSD

@@ -39,3 +44,9 @@ pkg install garage
 ```bash
 nix-shell -p garage
 ```
+
+## conda-forge
+
+```bash
+pixi global install garage
+```
@@ -33,7 +33,7 @@ by adding encryption at different levels.

 We would be very curious to know your needs and thougs about ideas such as
 encryption practices and things like key management, as we want Garage to be a
-serious base platform for the developpment of secure, encrypted applications.
+serious base platform for the development of secure, encrypted applications.
 Do not hesitate to come talk to us if you have any thoughts or questions on the
 subject.

@@ -59,7 +59,7 @@ For standard S3 API requests, Garage does not encrypt data at rest by itself.
 For the most generic at rest encryption of data, we recommend setting up your
 storage partitions on encrypted LUKS devices.

-If you are developping your own client software that makes use of S3 storage,
+If you are developing your own client software that makes use of S3 storage,
 we recommend implementing data encryption directly on the client side and never
 transmitting plaintext data to Garage. This makes it easy to use an external
 untrusted storage provider if necessary.
@@ -108,14 +108,14 @@ Protects against the following threats:

 - Stolen HDD

-Crucially, does not protect againt malicious sysadmins or remote attackers that
+Crucially, does not protect against malicious sysadmins or remote attackers that
 might gain access to your servers.

 Methods include full-disk encryption with tools such as LUKS.

 ## Encrypting data on the client side

-Protects againt the following threats:
+Protects against the following threats:

 - A honest-but-curious administrator
 - A malicious administrator that tries to corrupt your data
@@ -9,7 +9,7 @@ There are three methods to expose buckets as website:

 1. using the PutBucketWebsite S3 API call, which is allowed for access keys that have the owner permission bit set

-2. from the Garage CLI, by an adminstrator of the cluster
+2. from the Garage CLI, by an administrator of the cluster

 3. using the Garage administration API

@@ -20,12 +20,12 @@ sudo apt-get update
 sudo apt-get install build-essential
 ```

-## Building from source from the Gitea repository
+## Building from source from the Forgejo repository

 The primary location for Garage's source code is the
-[Gitea repository](https://git.deuxfleurs.fr/Deuxfleurs/garage),
+[Forgejo repository](https://git.deuxfleurs.fr/Deuxfleurs/garage),
 which contains all of the released versions as well as the code
-for the developpement of the next version.
+for the development of the next version.

 Clone the repository and enter it as follows:

@@ -41,7 +41,7 @@ git tag  				# List available tags
 git checkout v0.8.0		# Change v0.8.0 with the version you wish to build
 ```

-Otherwise you will be building a developpement build from the `main` branch
+Otherwise you will be building a development build from the `main` branch
 that includes all of the changes to be released in the next version.
 Be careful that such a build might be unstable or contain bugs,
 and could be incompatible with nodes that run stable versions of Garage.
@@ -85,11 +85,14 @@ The following feature flags are available in v0.8.0:
 | Feature flag | Enabled | Description |
 | ------------ | ------- | ----------- |
 | `bundled-libs` | *by default* | Use bundled version of sqlite3, zstd, lmdb and libsodium |
-| `system-libs` | optional | Use system version of sqlite3, zstd, lmdb and libsodium<br>if available (exclusive with `bundled-libs`, build using<br>`cargo build --no-default-features --features system-libs`) |
+| `consul-discovery` | optional | Enable automatic registration and discovery<br>of cluster nodes through the Consul API |
+| `fjall` | experimental | Enable using Fjall to store Garage's metadata |
+| `journald` | optional | Enable logging to systemd-journald with<br>`GARAGE_LOG_TO_JOURNALD=true` environment variable set |
 | `k2v` | optional | Enable the experimental K2V API (if used, all nodes on your<br>Garage cluster must have it enabled as well) |
 | `kubernetes-discovery` | optional | Enable automatic registration and discovery<br>of cluster nodes through the Kubernetes API |
-| `metrics` | *by default* | Enable collection of metrics in Prometheus format on the admin API |
-| `telemetry-otlp` | optional | Enable collection of execution traces using OpenTelemetry |
-| `syslog` | optional | Enable logging to Syslog |
 | `lmdb` | *by default* | Enable using LMDB to store Garage's metadata |
+| `metrics` | *by default* | Enable collection of metrics in Prometheus format on the admin API |
 | `sqlite` | *by default* | Enable using Sqlite3 to store Garage's metadata |
+| `syslog` | optional | Enable logging to Syslog with<br>`GARAGE_LOG_TO_SYSLOG=true` environment variable set |
+| `system-libs` | optional | Use system version of sqlite3, zstd, lmdb and libsodium<br>if available (exclusive with `bundled-libs`, build using<br>`cargo build --no-default-features --features system-libs`) |
+| `telemetry-otlp` | optional | Enable collection of execution traces using OpenTelemetry |
@@ -11,7 +11,7 @@ Firstly clone the repository:

 ```bash
 git clone https://git.deuxfleurs.fr/Deuxfleurs/garage
-cd garage/scripts/helm
+cd garage/script/helm
 ```

 Deploy with default options:
@@ -26,7 +26,7 @@ Or deploy with custom values:
 helm install --create-namespace --namespace garage garage ./garage -f values.override.yaml
 ```

-If you want to manage the CustomRessourceDefinition used by garage for its `kubernetes_discovery` outside of the helm chart, add `garage.kubernetesSkipCrd: true` to your custom values and use the kustomization before deploying the helm chart:
+If you want to manage the CustomResourceDefinition used by garage for its `kubernetes_discovery` outside of the helm chart, add `garage.kubernetesSkipCrd: true` to your custom values and use the kustomization before deploying the helm chart:

 ```bash
 kubectl apply -k ../k8s/crd
@@ -47,7 +47,7 @@ All possible configuration values can be found with:
 helm show values ./garage
 ```

-This is an example `values.overrride.yaml` for deploying in a microk8s cluster with a https s3 api ingress route:
+This is an example `values.override.yaml` for deploying in a microk8s cluster with a https s3 api ingress route:

 ```yaml
 garage:
@@ -96,14 +96,14 @@ to store 2 TB of data in total.
 ## Get a Docker image

 Our docker image is currently named `dxflrs/garage` and is stored on the [Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).
-We encourage you to use a fixed tag (eg. `v2.0.0`) and not the `latest` tag.
-For this example, we will use the latest published version at the time of the writing which is `v2.0.0` but it's up to you
+We encourage you to use a fixed tag (eg. `v2.2.0`) and not the `latest` tag.
+For this example, we will use the latest published version at the time of the writing which is `v2.2.0` but it's up to you
 to check [the most recent versions on the Docker Hub](https://hub.docker.com/r/dxflrs/garage/tags?page=1&ordering=last_updated).

 For example:

 ```
-sudo docker pull dxflrs/garage:v2.0.0
+sudo docker pull dxflrs/garage:v2.2.0
 ```

 ## Deploying and configuring Garage
@@ -171,7 +171,7 @@ docker run \
  -v /etc/garage.toml:/etc/garage.toml \
  -v /var/lib/garage/meta:/var/lib/garage/meta \
  -v /var/lib/garage/data:/var/lib/garage/data \
-  dxflrs/garage:v2.0.0
+  dxflrs/garage:v2.2.0
 ```

 With this command line, Garage should be started automatically at each boot.
@@ -185,7 +185,7 @@ If you want to use `docker-compose`, you may use the following `docker-compose.y
 version: "3"
 services:
  garage:
-    image: dxflrs/garage:v2.0.0
+    image: dxflrs/garage:v2.2.0
    network_mode: "host"
    restart: unless-stopped
    volumes:
@@ -7,7 +7,7 @@ The main reason to add a reverse proxy in front of Garage is to provide TLS to y

 In production you will likely need your certificates signed by a certificate authority.
 The most automated way is to use a provider supporting the [ACME protocol](https://datatracker.ietf.org/doc/html/rfc8555) 
-such as [Let's Encrypt](https://letsencrypt.org/), [ZeroSSL](https://zerossl.com/) or [Buypass Go SSL](https://www.buypass.com/ssl/products/acme).
+such as [Let's Encrypt](https://letsencrypt.org/) or [ZeroSSL](https://zerossl.com/).

 If you are only testing Garage, you can generate a self-signed certificate to follow the documentation:

@@ -97,7 +97,7 @@ server {
  location / {
    proxy_pass http://s3_backend;
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $host;
+    proxy_set_header Host $http_host;
    # Disable buffering to a temporary file.
    proxy_max_temp_file_size 0;
  }
@@ -272,7 +272,7 @@ Add the following configuration section [to compress response](https://doc.traef

 ### Add caching response

-Traefik's caching middleware is only available on [entreprise version](https://doc.traefik.io/traefik-enterprise/middlewares/http-cache/), however the freely-available [Souin plugin](https://github.com/darkweak/souin#tr%C3%A6fik-container) can also do the job. (section to be completed)
+Traefik's caching middleware is only available on [enterprise version](https://doc.traefik.io/traefik-enterprise/middlewares/http-cache/), however the freely-available [Souin plugin](https://github.com/darkweak/souin#tr%C3%A6fik-container) can also do the job. (section to be completed)

 ### Complete example

@@ -38,7 +38,7 @@ WantedBy=multi-user.target
 id is dynamically allocated by systemd (set with `DynamicUser=true`). It cannot
 access (read or write) home folders (`/home`, `/root` and `/run/user`), the
 rest of the filesystem can only be read but not written, only the path seen as
-`/var/lib/garage` is writable as seen by the service. Additionnaly, the process
+`/var/lib/garage` is writable as seen by the service. Additionally, the process
 can not gain new privileges over time.

 For this to work correctly, your `garage.toml` must be set with
@@ -10,7 +10,7 @@ perspective.  It will allow you to understand if Garage is a good fit for
 you, how to better use it, how to contribute to it, what can Garage could
 and could not do, etc.

- **[Goals and use cases](@/documentation/design/goals.md):** This page explains why Garage was concieved and what practical use cases it targets.
+- **[Goals and use cases](@/documentation/design/goals.md):** This page explains why Garage was conceived and what practical use cases it targets.

 - **[Related work](@/documentation/design/related-work.md):** This pages presents the theoretical background on which Garage is built, and describes other software storage solutions and why they didn't work for us.

@@ -31,5 +31,3 @@ We love to talk and hear about Garage, that's why we keep a log here:
  - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2021-04-28_spirals-team/talk.pdf)

  - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2020-12-02_wide-team/talk.pdf)
-
-
@@ -15,14 +15,14 @@ The more a user request will require intra-cluster requests to complete, the mor
 This is especially true for sequential requests: requests that must wait the result of another request to be sent.
 We designed Garage without consensus algorithms (eg. Paxos or Raft) to minimize the number of sequential and parallel requests.

-This serie of benchmarks quantifies the impact of this design choice.
+This series of benchmarks quantifies the impact of this design choice.

 ### On a simple simulated network

 We start with a controlled environment, all the instances are running on the same (powerful enough) machine.

-To control the network latency, we simulate the network with [mknet](https://git.deuxfleurs.fr/trinity-1686a/mknet) (a tool we developped, based on `tc` and the linux network stack).
-To mesure S3 endpoints latency, we use our own tool [s3lat](https://git.deuxfleurs.fr/quentin/s3lat/) to observe only the intra-cluster latency and not some contention on the nodes (CPU, RAM, disk I/O, network bandwidth, etc.).
+To control the network latency, we simulate the network with [mknet](https://git.deuxfleurs.fr/trinity-1686a/mknet) (a tool we developed, based on `tc` and the linux network stack).
+To measure S3 endpoints latency, we use our own tool [s3lat](https://git.deuxfleurs.fr/quentin/s3lat/) to observe only the intra-cluster latency and not some contention on the nodes (CPU, RAM, disk I/O, network bandwidth, etc.).
 Compared to other benchmark tools, S3Lat sends only one (small) request at the same time and measures its latency.
 We selected 5 standard endpoints that are often in the critical path: ListBuckets, ListObjects, GetObject, PutObject and RemoveObject.

@@ -32,7 +32,7 @@ In this first benchmark, we consider 5 instances that are located in a different

 Compared to garage, minio latency drastically increases on 3 endpoints: GetObject, PutObject, RemoveObject.

-We suppose that these requests on minio make transactions over Raft, involving 4 sequential requests: 1) sending the message to the leader, 2) having the leader dispatch it to the other nodes, 3) waiting for the confirmation of followers and finally 4) commiting it. With our current configuration, one Raft transaction will take around 400 ms. GetObject seems to correlate to 1 transaction while PutObject and RemoveObject seems to correlate to 2 or 3. Reviewing minio code would be required to confirm this hypothesis.
+We suppose that these requests on minio make transactions over Raft, involving 4 sequential requests: 1) sending the message to the leader, 2) having the leader dispatch it to the other nodes, 3) waiting for the confirmation of followers and finally 4) committing it. With our current configuration, one Raft transaction will take around 400 ms. GetObject seems to correlate to 1 transaction while PutObject and RemoveObject seems to correlate to 2 or 3. Reviewing minio code would be required to confirm this hypothesis.

 Conversely, garage uses an architecture similar to DynamoDB and never require global cluster coordination to answer a request.
 Instead, garage can always contact the right node in charge of the requested data, and can answer in as low as one request in the case of GetObject and PutObject. We also observed that Garage latency, while often lower to minio, is more dispersed: garage is still in beta and has not received any performance optimization yet.
@@ -50,7 +50,7 @@ We plot a similar graph as before:

 This new graph is very similar to the one before, neither minio or garage seems to benefit from this new topology, but they also do not suffer from it.

-Considering garage, this is expected: nodes in the same DC are put in the same zone, and then data are spread on different zones for data resiliency and availaibility.
+Considering garage, this is expected: nodes in the same DC are put in the same zone, and then data are spread on different zones for data resiliency and availability.
 Then, in the default mode, requesting data requires to query at least 2 zones to be sure that we have the most up to date information.
 These requests will involve at least one inter-DC communication.
 In other words, we prioritize data availability and synchronization over raw performances.
@@ -59,11 +59,13 @@ Garage themselves for the following tasks:

 - Hosting of their homepage, [privacyguides.org](https://www.privacyguides.org/), and various other static sites

- As a Mastodon object storage backend for [mstdn.party](https://mstdn.party/) and [mstdn.plus](https://mstdn.plus/)
+- As a PowerDNS authoritative zone backend through [Lightning Stream](https://doc.powerdns.com/lightningstream/latest/index.html) and [LMDB](https://doc.powerdns.com/authoritative/backends/lmdb.html)
+
+- As a Mastodon media storage backend for [mstdn.party](https://mstdn.party/) and [mstdn.plus](https://mstdn.plus/)

 - As a PeerTube storage backend for [neat.tube](https://neat.tube/)

 - As a [Matrix media backend](https://github.com/matrix-org/synapse-s3-storage-provider)

 Triplebit's Garage cluster is a multi-site cluster currently composed of
-10 nodes in 3 physical locations.
+15 storage nodes in 3 physical locations.
@@ -94,7 +94,7 @@ delete a tombstone, the following condition has to be met:

 - All nodes responsible for storing this entry are aware of the existence of
  the tombstone, i.e. they cannot hold another version of the entry that is
-  superseeded by the tombstone. This ensures that deleting the tombstone is
+  superseded by the tombstone. This ensures that deleting the tombstone is
  safe and that no deleted value will come back in the system.

 Garage uses atomic database operations (such as compare-and-swap and
@@ -141,4 +141,3 @@ rebalance of data, this would have led to the disk utilization to explode
 during the rebalancing, only to shrink again after 24 hours. The 10-minute
 delay is a compromise that gives good security while not having this problem of
 disk space explosion on rebalance.
-
@@ -37,7 +37,7 @@ However, Amazon S3 source code is not open but alternatives were proposed.
 We identified Minio, Pithos, Swift and Ceph.
 Minio/Ceph enforces a total order, so properties similar to a (relaxed) filesystem.
 Swift and Pithos are probably the most similar to AWS S3 with their consistent hashing ring.
-However Pithos is not maintained anymore. More precisely the company that published Pithos version 1 has developped a second version 2 but has not open sourced it.
+However Pithos is not maintained anymore. More precisely the company that published Pithos version 1 has developed a second version 2 but has not open sourced it.
 Some tests conducted by the [ACIDES project](https://acides.org/) have shown that Openstack Swift consumes way more resources (CPU+RAM) that we can afford. Furthermore, people developing Swift have not designed their software for geo-distribution.

 There were many attempts in research too. I am only thinking to [LBFS](https://pdos.csail.mit.edu/papers/lbfs:sosp01/lbfs.pdf) that was used as a basis for Seafile. But none of them have been effectively implemented yet.
@@ -63,7 +63,7 @@ Due to its industry oriented design, Ceph is also far from being *Simple* to ope
 In a certain way, Ceph and MinIO are closer together than they are from Garage or OpenStack Swift.

 **[Pithos](https://github.com/exoscale/pithos):**
-Pithos has been abandonned and should probably not used yet, in the following we explain why we did not pick their design.
+Pithos has been abandoned and should probably not used yet, in the following we explain why we did not pick their design.
 Pithos was relying as a S3 proxy in front of Cassandra (and was working with Scylla DB too).
 From its designers' mouth, storing data in Cassandra has shown its limitations justifying the project abandonment.
 They built a closed-source version 2 that does not store blobs in the database (only metadata) but did not communicate further on it.
@@ -23,7 +23,7 @@ This logic is defined in `nix/build_index.nix`.
 For each commit, we first pass the code to a formatter (rustfmt) and a linter (clippy).
 Then we try to build it in debug mode and run both unit tests and our integration tests.

-Additionnaly, when releasing, our integration tests are run on the release build for amd64 and i686.
+Additionally, when releasing, our integration tests are run on the release build for amd64 and i686.

 ## Generated Artifacts

@@ -32,7 +32,7 @@ We generate the following binary artifacts for now:
  - **os**: linux
  - **format**: static binary, docker container

-Additionnaly we also build two web pages and one JSON document:
+Additionally we also build two web pages and one JSON document:
  - the documentation (this website)
  - [the release page](https://garagehq.deuxfleurs.fr/_releases.html)
  - [the release list in JSON format](https://garagehq.deuxfleurs.fr/_releases.json)
@@ -67,7 +67,7 @@ nix copy --to 's3://nix?endpoint=garage.deuxfleurs.fr&region=garage&secret-key=/
 The previous command will only send the built package and not its dependencies.
 In the case of our CI pipeline, we want to cache all intermediate build steps
 as well. This can be done using this quite involved command (here as an example
-for the `pkgs.amd64.relase` package):
+for the `pkgs.amd64.release` package):

 ```bash
 nix copy -j8 \
@@ -174,5 +174,3 @@ drone sign --save Deuxfleurs/garage
 ```

 Looking at the file, you will see that most of the commands are `nix-shell` and `nix-build` commands with various parameters.
-
-
@@ -42,7 +42,7 @@ You may pause an ongoing scrub using `garage repair scrub pause`, but note that
 the scrub will resume automatically 24 hours later as Garage will not let your
 cluster run without a regular scrub. If the scrub procedure is too intensive
 for your servers and is slowing down your workload, the recommended solution
-is to increase the "scrub tranquility" using `garage repair scrub set-tranquility`.
+is to increase the "scrub tranquility" using `garage worker set scrub-tranquility`.
 A higher tranquility value will make Garage take longer pauses between two block
 verifications. Of course, scrubbing the entire data store will also take longer.

@@ -242,7 +242,7 @@ dc3                 Tags   Partitions        Capacity   Usable capacity
  TOTAL                    256 (256 unique)  2.0 GB     1000.0 MB (50.0%)
 ```

-As we can see, the node that was moved to `dc3` (node4) is only used at 25% (approximatively),
+As we can see, the node that was moved to `dc3` (node4) is only used at 25% (approximately),
 whereas the node that was already in `dc3` (node3) is used at 75%.

 This can be explained by the following:
@@ -260,7 +260,7 @@ This can be explained by the following:
 data can be removed to be moved to node1.

 - Garage will move data in equal proportions from all possible sources, in this
-  case it means that it will tranfer 25% of the entire data set from node3 to
+  case it means that it will transfer 25% of the entire data set from node3 to
  node1 and another 25% from node4 to node1.

 This explains why node3 ends with 75% utilization (100% from before minus 25%
@@ -40,7 +40,7 @@ First of all, Garage divides the set of all possible block hashes
 in a fixed number of slices (currently 1024), and assigns
 to each slice a primary storage location among the specified data directories.
 The number of slices having their primary location in each data directory
-is proportionnal to the capacity specified in the config file.
+is proportional to the capacity specified in the config file.

 When Garage receives a block to write, it will always write it in the primary
 directory of the slice that contains its hash.
@@ -161,4 +161,7 @@ your recovery options are as follows:

 - **Option 3: restoring a filesystem-level snapshot.** If you are using ZFS or
  BTRFS to snapshot your metadata partition, refer to their specific
-  documentation on rolling back or copying files from an old snapshot.
+  documentation on rolling back or copying files from an old snapshot. 
+  Note that, depending on the properties of the filesystem and of the DB engine,
+  if these snapshots were taken during a write operation to the database, they may
+  also be corrupted and thus unfit for recovery.
@@ -56,7 +56,7 @@ From a high level perspective, a major upgrade looks like this:
  10. Enable API access (reverse step 1)
  11. Monitor your cluster while load comes back, check that all your applications are happy with this new version

-### Major upgarades with minimal downtime
+### Major upgrades with minimal downtime

 There is only one operation that has to be coordinated cluster-wide: the switch of one version of the internal RPC protocol to the next.
 This means that an upgrade with very limited downtime can simply be performed from one major version to the next by restarting all nodes
@@ -132,7 +132,7 @@ docker run \
  -v /path/to/garage.toml:/etc/garage.toml \
  -v /path/to/garage/meta:/var/lib/garage/meta \
  -v /path/to/garage/data:/var/lib/garage/data \
-  dxflrs/garage:v2.0.0
+  dxflrs/garage:v2.2.0
 ```

 Under Linux, you can substitute `--network host` for `-p 3900:3900 -p 3901:3901 -p 3902:3902 -p 3903:3903`
@@ -6,41 +6,167 @@ weight = 40
 The Garage administration API is accessible through a dedicated server whose
 listen address is specified in the `[admin]` section of the configuration
 file (see [configuration file
-reference](@/documentation/reference-manual/configuration.md))
+reference](@/documentation/reference-manual/configuration.md)).

-**WARNING.** At this point, there is no commitment to the stability of the APIs described in this document.
-We will bump the version numbers prefixed to each API endpoint each time the syntax
-or semantics change, meaning that code that relies on these endpoint will break
-when changes are introduced.
-
-Versions:
- - Before Garage 0.7.2 - no admin API
- - Garage 0.7.2 - admin APIv0
- - Garage 0.9.0 - admin APIv1, deprecate admin APIv0
+The current version of the admin API is v2.  No breaking changes to the Garage
+administration API will be published outside of a major release.

+History of previous versions:

+ - Before Garage v0.7.2 - no admin API
+ - Garage v0.7.2 - admin API v0
+ - Garage v0.9.0 - admin API v1, deprecate admin API v0
+ - Garage v2.0.0 - admin API v2, deprecate admin API v1

 ## Access control

-The admin API uses two different tokens for access control, that are specified in the config file's `[admin]` section:
+### Using an API token

- `metrics_token`: the token for accessing the Metrics endpoint (if this token
-  is not set in the config file, the Metrics endpoint can be accessed without
-  access control);
-
- `admin_token`: the token for accessing all of the other administration
-  endpoints (if this token is not set in the config file, access to these
-  endpoints is disabled entirely).
-
-These tokens are used as simple HTTP bearer tokens. In other words, to
-authenticate access to an admin API endpoint, add the following HTTP header
-to your request:
+Administration API tokens tokens are used as simple HTTP bearer tokens. In
+other words, to authenticate access to an admin API endpoint, add the following
+HTTP header to your request:

 ```
 Authorization: Bearer <token>
 ```

-## Administration API endpoints
+### User-defined API tokens
+
+Cluster administrators may dynamically define administration tokens using the CLI commands under `garage admin-token`.
+Such tokens may be limited in scope, meaning that they may enable access to only a subset of API calls.
+They may also have an expiration date to limit their use in time.
+
+Here is an example to create an administration token that is valid for 30 days
+and gives access to only a subset of API calls, allowing it to create buckets
+and access keys and give keys permissions on buckets:
+
+```bash
+$ garage admin-token create --expires-in 30d \
+    --scope ListBuckets,GetBucketInfo,ListKeys,GetKeyInfo,CreateBucket,CreateKey,AllowBucketKey,DenyBucketKey \
+    my-token
+This is your secret bearer token, it will not be shown again by Garage:
+
+  8ed1830b10a276ff57061950.kOSIpxWK9zSGbTO9Xadpv3YndSFWma0_snXcYHaORXk
+
+==== ADMINISTRATION TOKEN INFORMATION ====
+Token ID:    8ed1830b10a276ff57061950
+Token name:  my-token
+Created:     2025-06-15 15:12:44.160 +02:00
+Validity:    valid
+Expiration:  2025-07-15 15:12:44.117 +02:00
+
+Scope:       ListBuckets
+             GetBucketInfo
+             ListKeys
+             GetKeyInfo
+             CreateBucket
+             CreateKey
+             AllowBucketKey
+             DenyBucketKey
+```
+
+When running this command, your token will be shown only once and **will never
+be shown again by Garage**, so make sure to save it directly.  The token is
+hashed internally, and is identified by its prefix (32 hex digits followed by a
+dot) which is saved in clear.
+
+When running `garage admin-token list`, you might see something like this:
+
+```
+ID                        Created     Name                                       Expiration                      Scope
+-                         -           metrics_token (from daemon configuration)  never                           Metrics
+8ed1830b10a276ff57061950  2025-06-15  my-token                                   2025-07-15 15:12:44.117 +02:00  ListBuckets, ... (8)
+```
+
+### Master API tokens
+
+The admin API can also use two different master tokens for access control,
+specified in the config file's `[admin]` section:
+
+- `metrics_token`: the token for accessing the Metrics endpoint. If this token
+  is not set in the config file, the Metrics endpoint can be accessed without
+  access control.
+
+- `admin_token`: the token for accessing all of the other administration
+  endpoints. If this token is not set in the config file, access to these
+  endpoints is only possible with a user-defined admin token.
+
+With the introduction of multiple user-defined admin tokens, the use of master
+API tokens is now discouraged.
+
+
+## Using the admin API
+
+All of the admin API endpoints are described in the OpenAPI specification:
+
+ - APIv2 - [HTML spec](https://garagehq.deuxfleurs.fr/api/garage-admin-v2.html) - [OpenAPI JSON](https://garagehq.deuxfleurs.fr/api/garage-admin-v2.json)
+ - APIv1 (deprecated) - [HTML spec](https://garagehq.deuxfleurs.fr/api/garage-admin-v1.html) - [OpenAPI YAML](https://garagehq.deuxfleurs.fr/api/garage-admin-v1.yml)
+ - APIv0 (deprecated) - [HTML spec](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.html) - [OpenAPI YAML](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.yml)
+
+Making a request to the API from the command line can be as simple as running:
+
+```bash
+curl -H 'Authorization: Bearer s3cr3t' http://localhost:3903/v2/GetClusterStatus | jq
+```
+
+For more advanced use cases, we recommend using an SDK.  
+[Go to the "Build your own app" section to know how to use our SDKs](@/documentation/build/_index.md)
+
+### Making API calls from the `garage` CLI
+
+Since v2.0.0, the `garage` binary provides a subcommand `garage json-api` that
+allows you to invoke the API without making an HTTP request.  This can be
+useful for scripting Garage deployments.
+
+`garage json-api` proxies API calls through Garage's internal RPC protocol,
+therefore it does not require any form of authentication: RPC connection
+parameters are discovered automatically to contact the locally-running Garage
+instance (as when running any other `garage` CLI command).
+
+For simple calls that take no parameters, usage is as follows:
+
+```
+$ garage json-api GetClusterHealth
+{
+  "connectedNodes": 3,
+  "knownNodes": 3,
+  "partitions": 256,
+  "partitionsAllOk": 256,
+  "partitionsQuorum": 256,
+  "status": "healthy",
+  "storageNodes": 3,
+  "storageNodesOk": 3
+}
+```
+
+If you need to specify a JSON body for your call, you can add it directly after
+the name of the function you are calling:
+
+```
+$ garage json-api CreateAdminToken '{"name": "test"}'
+```
+
+Or you can feed it through stdin by adding a `-` as the last command parameter:
+
+```
+$ garage json-api CreateAdminToken -
+{"name": "test"}
+<EOF>
+```
+
+For admin API calls that would have taken query parameters in their HTTP version, these parameters can be passed in the JSON body object:
+
+```
+$ garage json-api GetAdminTokenInfo '{"id":"b0e6e0ace2c0b2aca4cdb2de"}'
+```
+
+For admin API calls that take both query parameters and a JSON body, combine them in the following fashion:
+
+```
+$ garage json-api UpdateAdminToken '{"id":"b0e6e0ace2c0b2aca4cdb2de", "body":{"name":"not a test"}}'
+```
+
+## Special administration API endpoints

 ### Metrics `GET /metrics`

@@ -83,7 +209,7 @@ content-length: 102
 date: Tue, 08 Aug 2023 07:22:38 GMT

 Garage is fully operational
-Consult the full health check API endpoint at /v0/health for more details
+Consult the full health check API endpoint at /v2/GetClusterHealth for more details
 ```

 ### On-demand TLS `GET /check`
@@ -126,23 +252,7 @@ $ curl -so /dev/null -w "%{http_code}" http://localhost:3903/check?domain=exampl
 200
 ```

-
 **References:**
 - [Using On-Demand TLS](https://caddyserver.com/docs/automatic-https#using-on-demand-tls)
 - [Add option for a backend check to approve use of on-demand TLS](https://github.com/caddyserver/caddy/pull/1939)
 - [Serving tens of thousands of domains over HTTPS with Caddy](https://caddy.community/t/serving-tens-of-thousands-of-domains-over-https-with-caddy/11179)
-
-### Cluster operations
-
-These endpoints have a dedicated OpenAPI spec.
- - APIv1 - [HTML spec](https://garagehq.deuxfleurs.fr/api/garage-admin-v1.html) - [OpenAPI YAML](https://garagehq.deuxfleurs.fr/api/garage-admin-v1.yml)
- - APIv0 (deprecated) - [HTML spec](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.html) - [OpenAPI YAML](https://garagehq.deuxfleurs.fr/api/garage-admin-v0.yml)
-
-Requesting the API from the command line can be as simple as running:
-
-```bash
-curl -H 'Authorization: Bearer s3cr3t' http://localhost:3903/v0/status | jq
-```
-
-For more advanced use cases, we recommend using a SDK.  
-[Go to the "Build your own app" section to know how to use our SDKs](@/documentation/build/_index.md)
@@ -24,7 +24,8 @@ db_engine = "lmdb"

 block_size = "1M"
 block_ram_buffer_max = "256MiB"
-
+block_max_concurrent_reads = 16
+block_max_concurrent_writes_per_request =10
 lmdb_map_size = "1T"

 compression_level = 1
@@ -50,17 +51,20 @@ allow_punycode = false

 [consul_discovery]
 api = "catalog"
-consul_http_addr = "http://127.0.0.1:8500"
+consul_http_addr = "https://127.0.0.1:8500"
+tls_skip_verify = false
 service_name = "garage-daemon"
+
 ca_cert = "/etc/consul/consul-ca.crt"
 client_cert = "/etc/consul/consul-client.crt"
 client_key = "/etc/consul/consul-key.crt"
+
 # for `agent` API mode, unset client_cert and client_key, and optionally enable `token`
 # token = "abcdef-01234-56789"
-tls_skip_verify = false
+
 tags = [ "dns-enabled" ]
 meta = { dns-acl = "allow trusted" }
-
+datacenters = ["dc1", "dc2", "dc3"]

 [kubernetes_discovery]
 namespace = "garage"
@@ -97,6 +101,8 @@ The following gives details about each available configuration option.
 Top-level configuration options, in alphabetical order:
 [`allow_punycode`](#allow_punycode),
 [`allow_world_readable_secrets`](#allow_world_readable_secrets),
+[`block_max_concurrent_reads`](#block_max_concurrent_reads),
+[`block_max_concurrent_writes_per_request`](#block_max_concurrent_writes_per_request),
 [`block_ram_buffer_max`](#block_ram_buffer_max),
 [`block_size`](#block_size),
 [`bootstrap_peers`](#bootstrap_peers),
@@ -125,12 +131,14 @@ The `[consul_discovery]` section:
 [`client_cert`](#consul_client_cert_and_key),
 [`client_key`](#consul_client_cert_and_key),
 [`consul_http_addr`](#consul_http_addr),
+[`datacenters`](#consul_datacenters)
 [`meta`](#consul_tags_and_meta),
 [`service_name`](#consul_service_name),
 [`tags`](#consul_tags_and_meta),
 [`tls_skip_verify`](#consul_tls_skip_verify),
 [`token`](#consul_token).

+
 The `[kubernetes_discovery]` section:
 [`namespace`](#kube_namespace),
 [`service_name`](#kube_service_name),
@@ -335,6 +343,7 @@ Since `v0.8.0`, Garage can use alternative storage backends as follows:
 | --------- | ----------------- | ------------- |
 | [LMDB](https://www.symas.com/lmdb) (since `v0.8.0`, default since `v0.9.0`) | `"lmdb"` | `<metadata_dir>/db.lmdb/` |
 | [Sqlite](https://sqlite.org) (since `v0.8.0`) | `"sqlite"` | `<metadata_dir>/db.sqlite` |
+| [Fjall](https://github.com/fjall-rs/fjall) (**experimental support** since `v1.3.0`/`v2.1.0`) | `"fjall"` | `<metadata_dir>/db.fjall/` |
 | [Sled](https://sled.rs) (old default, removed since `v1.0`) | `"sled"` | `<metadata_dir>/db/` |

 Sled was supported until Garage v0.9.x, and was removed in Garage v1.0.
@@ -343,8 +352,16 @@ old Sled metadata databases to another engine.

 Performance characteristics of the different DB engines are as follows:

- LMDB: the recommended database engine for high-performance distributed clusters.
-LMDB works very well, but is known to have the following limitations:
+- **LMDB:** the recommended database engine for high-performance distributed clusters
+  with `replication_factor` ≥ 2.
+  LMDB works well, but is known to have the following limitations:
+
+  - LMDB is prone to database corruption after an unclean shutdown (e.g. a process kill
+    or a power outage).  It is recommended to configure
+    [`metadata_auto_snapshot_interval`](#metadata_auto_snapshot_interval) to be
+    able to easily recover from this situation. With `replication_factor` ≥ 2,
+    metadata can also be reconstructed from remote nodes upon corruption
+    (see [Recovering from failures](@/documentation/operations/recovering.md#corrupted_meta)).

  - The data format of LMDB is not portable between architectures, so for
    instance the Garage database of an x86-64 node cannot be moved to an ARM64
@@ -354,22 +371,21 @@ LMDB works very well, but is known to have the following limitations:
    node to very small database sizes due to how LMDB works; it is therefore
    not recommended.

-  - Several users have reported corrupted LMDB database files after an unclean
-    shutdown (e.g. a power outage). This situation can generally be recovered
-    from if your cluster is geo-replicated (by rebuilding your metadata db from
-    other nodes), or if you have saved regular snapshots at the filesystem
-    level.
-
  - Keys in LMDB are limited to 511 bytes. This limit translates to limits on
-    object keys in S3 and sort keys in K2V that are limted to 479 bytes.
+    object keys in S3 and sort keys in K2V that are limited to 479 bytes.

- Sqlite: Garage supports Sqlite as an alternative storage backend for
-  metadata, which does not have the issues listed above for LMDB.
-  On versions 0.8.x and earlier, Sqlite should be avoided due to abysmal
-  performance, which was fixed with the addition of `metadata_fsync`.
-  Sqlite is still probably slower than LMDB due to the way we use it,
-  so it is not the best choice for high-performance storage clusters,
-  but it should work fine in many cases.
+- **Sqlite:** Garage supports Sqlite as an alternative storage backend for
+  metadata, which does not have the issues listed above for LMDB.  Sqlite is
+  slower than LMDB, so it is not the best choice for high-performance storage
+  clusters.
+
+- **Fjall:** a storage engine based on LSM trees, which theoretically allow for
+  higher write throughput than other storage engines that are based on B-trees.
+  Using Fjall could potentially improve Garage's performance significantly in
+  write-heavy workloads. **Support for Fjall is experimental at this point**,
+  we have added it to Garage for evaluation purposes only. **Use it only with
+  test data, and report any issues to our bug tracker. Do not use it for
+  production workloads.**

 It is possible to convert Garage's metadata directory from one format to another
 using the `garage convert-db` command, which should be used as follows:
@@ -380,7 +396,7 @@ garage convert-db -a <input db engine> -i <input db path> \
 ```

 Make sure to specify the full database path as presented in the table above
-(third colummn), and not just the path to the metadata directory.
+(third column), and not just the path to the metadata directory.

 #### `metadata_fsync` {#metadata_fsync}

@@ -408,6 +424,7 @@ Here is how this option impacts the different database engines:
 |----------|------------------------------------|-------------------------------|
 | Sqlite   | `PRAGMA synchronous = OFF`         | `PRAGMA synchronous = NORMAL` |
 | LMDB     | `MDB_NOMETASYNC` + `MDB_NOSYNC`    | `MDB_NOMETASYNC`              |
+| Fjall    | default options                    | not supported                 |

 Note that the Sqlite database is always ran in `WAL` mode (`PRAGMA journal_mode = WAL`).

@@ -421,13 +438,14 @@ This might reduce the risk that a data block is lost in rare
 situations such as simultaneous node losing power,
 at the cost of a moderate drop in write performance.

-Similarly to `metatada_fsync`, this is likely not necessary
+Similarly to `metadata_fsync`, this is likely not necessary
 if geographical replication is used.

 #### `metadata_auto_snapshot_interval` (since `v0.9.4`) {#metadata_auto_snapshot_interval}

 If this value is set, Garage will automatically take a snapshot of the metadata
-DB file at a regular interval and save it in the metadata directory.
+DB file at a regular interval and save it in the metadata directory,
+or in [`metadata_snapshots_dir`](#metadata_snapshots_dir) if it is set.
 This parameter can take any duration string that can be parsed by
 the [`parse_duration`](https://docs.rs/parse_duration/latest/parse_duration/#syntax) crate.

@@ -436,14 +454,19 @@ corrupted, for instance after an unclean shutdown.  See [this
 page](@/documentation/operations/recovering.md#corrupted_meta) for details.
 Garage keeps only the two most recent snapshots of the metadata DB and deletes
 older ones automatically.
+You can also create metadata snapshots manually at any point using the
+`garage meta snapshot` command.
+
+Using snapshots created by Garage is the best option to make snapshots of your
+node's metadata for potential recovery, as they are guaranteed to be clean and
+consistent, contrarily to filesystem-level snapshots that may be taken while
+some writes are in-flight and thus might be corrupted.

 Note that taking a metadata snapshot is a relatively intensive operation as the
 entire data file is copied. A snapshot being taken might have performance
 impacts on the Garage node while it is running. If the cluster is under heavy
 write load when a snapshot operation is running, this might also cause the
 database file to grow in size significantly as pages cannot be recycled easily.
-For this reason, it might be better to use filesystem-level snapshots instead
-if possible.

 #### `disable_scrub` {#disable_scrub}

@@ -514,6 +537,37 @@ node.

 The default value is 256MiB.

+#### `block_max_concurrent_reads` (since `v1.3.0` / `v2.1.0`) {#block_max_concurrent_reads}
+
+The maximum number of blocks (individual files in the data directory) open
+simultaneously for reading.
+
+Reducing this number does not limit the number of data blocks that can be
+transferred through the network simultaneously. This mechanism was just added
+as a backpressure mechanism for HDD read speed: it helps avoid a situation
+where too many requests are coming in and Garage is reading too many block
+files simultaneously, thus not making timely progress on any of the reads.
+
+When a request to read a data block comes in through the network, the requests
+awaits for one of the `block_max_concurrent_reads` slots to be available
+(internally implemented using a Semaphore object). Once it acquired a read
+slot, it reads the entire block file to RAM and frees the slot as soon as the
+block file is finished reading. Only after the slot is released will the
+block's data start being transferred over the network.  If the request fails to
+acquire a reading slot within 15 seconds, it fails with a timeout error.
+Timeout events can be monitored through the `block_read_semaphore_timeouts`
+metric in Prometheus: a non-zero number of such events indicates an I/O
+bottleneck on HDD read speed.
+
+
+#### `block_max_concurrent_writes_per_request` (since `v1.3.1` / `v2.2.0`) {#block_max_concurrent_writes_per_request}
+
+This parameter is designed to adapt to the concurrent write performance of 
+different storage media. Maximum number of parallel block writes per put request.
+Higher values may improve throughput but increase memory usage.
+
+Default value: 3. Recommended values: 10-30 for NVMe, 3-10 for spinning HDD.
+
 #### `lmdb_map_size` {#lmdb_map_size}

 This parameters can be used to set the map size used by LMDB,
@@ -563,11 +617,11 @@ storing the secret as the `GARAGE_RPC_SECRET_FILE` environment variable.

 #### `rpc_bind_addr` {#rpc_bind_addr}

-The address and port on which to bind for inter-cluster communcations
-(reffered to as RPC for remote procedure calls).
+The address and port on which to bind for inter-cluster communications
+(referred to as RPC for remote procedure calls).
 The port specified here should be the same one that other nodes will used to contact
 the node, even in the case of a NAT: the NAT should be configured to forward the external
-port number to the same internal port nubmer. This means that if you have several nodes running
+port number to the same internal port number. This means that if you have several nodes running
 behind a NAT, they should each use a different RPC port number.

 #### `rpc_bind_outgoing` (since `v0.9.2`) {#rpc_bind_outgoing}
@@ -686,6 +740,18 @@ node_prefix "" {
 }
 ```

+
+#### `datacenters` {#consul_datacenters}
+
+Optional list of datacenters that allow garage to do service discovery when Consul is configured in WAN federation.
+
+Example: `datacenters = ["dc1", "dc2", "dc3"]`
+
+In a WAN configuration, by default the Consul services API only responds with
+local LAN services.  When a list of datacenters is specified using this option,
+Garage will query the consul server API by datacenter directly, allowing for
+Garage to discover nodes across the Consul WAN.
+
 #### `tags` and `meta` {#consul_tags_and_meta}

 Additional list of tags and map of service meta to add during service registration.
@@ -718,14 +784,14 @@ manually.
 #### `api_bind_addr` {#s3_api_bind_addr}

 The IP and port on which to bind for accepting S3 API calls.
-This endpoint does not suport TLS: a reverse proxy should be used to provide it.
+This endpoint does not support TLS: a reverse proxy should be used to provide it.

 Alternatively, since `v0.8.5`, a path can be used to create a unix socket with 0222 mode.

 #### `s3_region` {#s3_region}

-Garage will accept S3 API calls that are targetted to the S3 region defined here.
-API calls targetted to other regions will fail with a AuthorizationHeaderMalformed error
+Garage will accept S3 API calls that are targeted to the S3 region defined here.
+API calls targeted to other regions will fail with a AuthorizationHeaderMalformed error
 message that redirects the client to the correct region.

 #### `root_domain` {#s3_root_domain}
@@ -733,7 +799,7 @@ message that redirects the client to the correct region.
 The optional suffix to access bucket using vhost-style in addition to path-style request.
 Note path-style requests are always enabled, whether or not vhost-style is configured.
 Configuring vhost-style S3 required a wildcard DNS entry, and possibly a wildcard TLS certificate,
-but might be required by softwares not supporting path-style requests.
+but might be required by software not supporting path-style requests.

 If `root_domain` is `s3.garage.eu`, a bucket called `my-bucket` can be interacted with
 using the hostname `my-bucket.s3.garage.eu`.
@@ -749,7 +815,7 @@ behaviour of this module.

 The IP and port on which to bind for accepting HTTP requests to buckets configured
 for website access.
-This endpoint does not suport TLS: a reverse proxy should be used to provide it.
+This endpoint does not support TLS: a reverse proxy should be used to provide it.

 Alternatively, since `v0.8.5`, a path can be used to create a unix socket with 0222 mode.

@@ -822,7 +888,7 @@ You can use any random string for this value. We recommend generating a random t

 If this is set to `true`, accessing the metrics endpoint will always require
 an access token. Valid tokens include the `metrics_token` if it is set,
-and admin API token defined dynamicaly in Garage which have
+and admin API token defined dynamically in Garage which have
 the `Metrics` endpoint in their scope.

 #### `trace_sink` {#admin_trace_sink}
@@ -46,7 +46,7 @@ to select the replication mode best suited to your use case (hint: in most cases

 ### Compression and deduplication

-All data stored in Garage is deduplicated, and optionnally compressed using
+All data stored in Garage is deduplicated, and optionally compressed using
 Zstd.  Objects uploaded to Garage are chunked in blocks of constant sizes (see
 [`block_size`](@/documentation/reference-manual/configuration.md#block_size)),
 and the hashes of individual blocks are used to dispatch them to storage nodes
@@ -84,13 +84,13 @@ exposing the same content under different domain names.

 Garage also supports bucket aliases which are local to a single user:
 this allows different users to have different buckets with the same name, thus avoiding naming collisions.
-This can be helpfull for instance if you want to write an application that creates per-user buckets with always the same name.
+This can be helpful for instance if you want to write an application that creates per-user buckets with always the same name.

 This feature is totally invisible to S3 clients and does not break compatibility with AWS.

 ### Cluster administration API

-Garage provides a fully-fledged REST API to administer your cluster programatically.
+Garage provides a fully-fledged REST API to administer your cluster programmatically.
 Functionality included in the admin API include: setting up and monitoring
 cluster nodes, managing access credentials, and managing storage buckets and bucket aliases.
 A full reference of the administration API is available [here](@/documentation/reference-manual/admin-api.md).
@@ -100,7 +100,7 @@ A full reference of the administration API is available [here](@/documentation/r
 Garage makes some internal metrics available in the Prometheus data format,
 which allows you to build interactive dashboards to visualize the load and internal state of your storage cluster.

-For developpers and performance-savvy administrators,
+For developers and performance-savvy administrators,
 Garage also supports exporting traces of what it does internally in OpenTelemetry format.
 This allows to monitor the time spent at various steps of the processing of requests,
 in order to detect potential performance bottlenecks.
@@ -129,5 +129,5 @@ related to objects stored in an S3 bucket.
 In the context of our research project, [Aérogramme](https://aerogramme.deuxfleurs.fr),
 K2V is used to provide metadata and log storage for operations on encrypted e-mail storage.

-Learn more on the specification of K2V [here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/k2v/doc/drafts/k2v-spec.md)
+Learn more on the specification of K2V [here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/f8be15c37db857e177d543de7be863692628d567/doc/drafts/k2v-spec.md)
 and on how to enable it in Garage [here](@/documentation/reference-manual/k2v.md).
@@ -16,10 +16,10 @@ the `k2v` feature flag enabled can be obtained from our download page under
 with `-k2v` (example: `v0.7.2-k2v`).

 The specification of the K2V API can be found
-[here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/doc/drafts/k2v-spec.md).
+[here](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/commit/f8be15c37db857e177d543de7be863692628d567/doc/drafts/k2v-spec.md).
 This document also includes a high-level overview of K2V's design.

-The K2V API uses AWSv4 signatures for authentification, same as the S3 API.
+The K2V API uses AWSv4 signatures for authentication, same as the S3 API.
 The AWS region used for signature calculation is always the same as the one
 defined for the S3 API in the config file.

@@ -55,4 +55,3 @@ cargo build --features cli --bin k2v-cli
 The CLI utility is self-documented, run `k2v-cli --help` to learn how to use
 it. There is also a short README.md in the `src/k2v-client` folder with some
 instructions.
-
@@ -27,7 +27,7 @@ Feel free to open a PR to suggest fixes this table. Minio is missing because the

 | Feature                      | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
-| [signature v2](https://docs.aws.amazon.com/general/latest/gr/signature-version-2.html) (deprecated) | ❌ Missing | ✅ |  ✅ | ✅ | ✅ |
+| [signature v2](https://docs.aws.amazon.com/AmazonS3/latest/API/Appendix-Sigv2.html) (deprecated) | ❌ Missing | ✅ |  ✅ | ✅ | ✅ |
 | [signature v4](https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html) |  ✅ Implemented |  ✅ |  ✅ | ❌ | ✅ |
 | [URL path-style](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access) (eg. `host.tld/bucket/key`) |  ✅ Implemented | ✅ |  ✅ | ❓| ✅ |
 | [URL vhost-style](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#virtual-hosted-style-access) URL (eg. `bucket.host.tld/key`) |  ✅ Implemented | ❌| ✅| ✅ | ✅ |
@@ -45,7 +45,7 @@ we suppose that OpenIO supports presigned URLs.
 All endpoints that are missing on Garage will return a 501 Not Implemented.
 Some `x-amz-` headers are not implemented.

-### Core endoints
+### Core endpoints

 | Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
 |------------------------------|----------------------------------|-----------------|---------------|---------|-----|
@@ -135,12 +135,12 @@ If you need this feature, please [share your use case in our dedicated issue](ht
 **PutBucketLifecycleConfiguration:** The only actions supported are
 `AbortIncompleteMultipartUpload` and `Expiration` (without the
 `ExpiredObjectDeleteMarker` field).  All other operations are dependent on
-either bucket versionning or storage classes which Garage currently does not
+either bucket versioning or storage classes which Garage currently does not
 implement. The deprecated `Prefix` member directly in the the `Rule`
 structure/XML tag is not supported, specified prefixes must be inside the
 `Filter` structure/XML tag.

-**GetBucketVersioning:** Stub implementation which always returns "versionning not enabled", since Garage does not yet support bucket versionning.
+**GetBucketVersioning:** Stub implementation which always returns "versioning not enabled", since Garage does not yet support bucket versioning.

 ### Replication endpoints

@@ -155,7 +155,7 @@ Please open an issue if you have a use case for replication.
 *Note: Ceph documentation briefly says that Ceph supports
 [replication through the S3 API](https://docs.ceph.com/en/latest/radosgw/multisite-sync-policy/#s3-replication-api)
 but with some limitations.
-Additionaly, replication endpoints are not documented in the S3 compatibility page so I don't know what kind of support we can expect.*
+Additionally, replication endpoints are not documented in the S3 compatibility page so I don't know what kind of support we can expect.*

 ### Locking objects

@@ -197,7 +197,7 @@ Please open an issue if you have a use case.

 ### Vendor specific endpoints

-<details><summary>Display Amazon specifc endpoints</summary>
+<details><summary>Display Amazon specific endpoints</summary>


 | Endpoint                     | Garage                           | [Openstack Swift](https://docs.openstack.org/swift/latest/s3_compat.html) | [Ceph Object Gateway](https://docs.ceph.com/en/latest/radosgw/s3/) | [Riak CS](https://docs.riak.com/riak/cs/2.1.1/references/apis/storage/s3/index.html) | [OpenIO](https://docs.openio.io/latest/source/arch-design/s3_compliancy.html) |
@@ -234,4 +234,3 @@ Please open an issue if you have a use case.
 | [SelectObjectContent](https://docs.aws.amazon.com/AmazonS3/latest/API/API_SelectObjectContent.html) | ❌ Missing | ❌| ❌| ❌| ❌|

 </details>
-
@@ -3,7 +3,7 @@ title = "S3 compatibility target"
 weight = 5
 +++

-If there is a specific S3 functionnality you have a need for, feel free to open
+If there is a specific S3 functionality you have a need for, feel free to open
 a PR to put the corresponding endpoints higher in the list.  Please explain
 your motivations for doing so in the PR message.

@@ -68,7 +68,7 @@ Workflow for DELETE:
 1. Check write permission (LDAP)
 2. Get current version (or versions) in object table
 3. Do the deletion of those versions NOT IN A BACKGROUND JOB THIS TIME
-4. Return succes to the user if we were able to delete blocks from the blocks table and entries from the object table
+4. Return success to the user if we were able to delete blocks from the blocks table and entries from the object table

 To delete a version:

@@ -92,7 +92,7 @@ Known issue: if someone is reading from a version that we want to delete and the
 - file path = /meta/(first 3 hex digits of hash)/(rest of hash)
 - map block hash -> set of version UUIDs where it is referenced

-Usefull metadata:
+Useful 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, useful in the rebalancing algorithm
@@ -49,12 +49,12 @@ The ring construction that selects `n_token` random positions for each nodes giv
 is not well-balanced: the space between the tokens varies a lot, and some partitions are thus bigger than others.
 This problem was demonstrated in the original Dynamo DB paper.

-To solve this, we want to apply a better second method for partitionning our dataset:
+To solve this, we want to apply a better second method for partitioning our dataset:

 1. fix an initially large number of partitions (say 1024) with evenly-spaced delimiters, 

 2. attribute each partition randomly to a node, with a probability
-   proportionnal to its capacity (which `n_tokens` represented in the first
+   proportional to its capacity (which `n_tokens` represented in the first
   method)

 For now we continue using the multi-DC ring walking described above.
@@ -66,7 +66,7 @@ I have studied two ways to do the attribution of partitions to nodes, in a way t

 MagLev provided significantly better balancing, as it guarantees that the exact
 same number of partitions is attributed to all nodes that have the same
-capacity (and that this number is proportionnal to the node's capacity, except
+capacity (and that this number is proportional to the node's capacity, except
 for large values), however in both cases:

 - the distribution is still bad, because we use the naive multi-DC ring walking
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.3 to 0.4"
-weight = 20
+weight = 80
 +++

 **Migrating from 0.3 to 0.4 is unsupported. This document is only intended to
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.5 to 0.6"
-weight = 15
+weight = 75
 +++

 **This guide explains how to migrate to 0.6 if you have an existing 0.5 cluster.
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.6 to 0.7"
-weight = 14
+weight = 74
 +++
 **This guide explains how to migrate to 0.7 if you have an existing 0.6 cluster.
 We don't recommend trying to migrate to 0.7 directly from 0.5 or older.**
@@ -19,7 +19,7 @@ The migration steps are as follows:
 2. Disable API and web access. Garage does not support disabling
   these endpoints but you can change the port number or stop your reverse
   proxy for instance.
-3. Check once again that your cluster is healty. Run again `garage repair --all-nodes --yes tables` which is quick.
+3. Check once again that your cluster is healthy. Run again `garage repair --all-nodes --yes tables` which is quick.
   Also check your queues are empty, run `garage stats` to query them.
 4. Turn off Garage v0.6
 5. Backup the metadata folder of all your nodes: `cd /var/lib/garage ; tar -acf meta-v0.6.tar.zst meta/`
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.7 to 0.8"
-weight = 13
+weight = 73
 +++

 **This guide explains how to migrate to 0.8 if you have an existing 0.7 cluster.
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.8 to 0.9"
-weight = 12
+weight = 72
 +++

 **This guide explains how to migrate to 0.9 if you have an existing 0.8 cluster.
@@ -1,6 +1,6 @@
 +++
 title = "Migrating from 0.9 to 1.0"
-weight = 11
+weight = 71
 +++

 **This guide explains how to migrate to 1.0 if you have an existing 0.9 cluster.
@@ -0,0 +1,70 @@
+++
+title = "Migrating from 1.0 to 2.0"
+weight = 70
+++
+
+**This guide explains how to migrate to v2.x if you have an existing v1.x.x cluster.
+We don't recommend trying to migrate to v2.x directly from v0.9.x or older.**
+
+This migration procedure has been tested on several clusters without issues.
+However, it is still a *critical procedure* that might cause issues.
+**Make sure to back up all your data before attempting it!**
+
+You might also want to read our [general documentation on upgrading Garage](@/documentation/operations/upgrading.md).
+
+## Changes introduced in v2.0
+
+The following are **breaking changes** in Garage v2.0 that require your attention when migrating:
+
+- The administration API has been completely reworked.
+  Some calls to the `/v1/` endpoints will still work but most will not.
+  New endpoints are prefixed by `/v2/`. **You will need to update all your code that makes use of the admin API.**
+
+- `replication_mode` is no longer a supported configuration parameter,
+  please use `replication_factor` and `consistency_mode` instead.
+
+## Migration procedure
+
+The migration to Garage v2.0 can be done with almost no downtime,
+by restarting all nodes at once in the new version.
+
+The migration steps are as follows:
+
+1. Do a `garage repair --all-nodes --yes tables`, check the logs and check that
+   all data seems to be synced correctly between nodes. If you have time, do
+   additional `garage repair` procedures (`blocks`, `versions`, `block_refs`,
+   etc.)
+
+2. Ensure you have a snapshot of your Garage installation that you can restore
+   to in case the upgrade goes wrong, with one of the following options:
+
+   - You may use the `garage meta snapshot --all` command
+     to make a backup snapshot of the metadata directories of your nodes
+     for backup purposes. Once this command has completed, copy the following
+     files and directories from the `metadata_dir` of all your nodes
+     to somewhere safe: `snapshots`, `cluster_layout`, `data_layout`,
+     `node_key`, `node_key.pub`. (If you have set the `metadata_snapshots_dir`
+     to a different value in your config file, back up that directory instead.)
+
+   - If you are running a filesystem such as ZFS or BTRFS that support
+     snapshotting, you can create a filesystem-level snapshot of the `metadata_dir`
+     of all your nodes to be used as a restoration point if needed.
+
+   - You may also make a back-up manually: turn off each node
+     individually; back up its metadata folder (for instance, use the following
+     command if your metadata directory is `/var/lib/garage/meta`: `cd
+     /var/lib/garage ; tar -acf meta-v1.0.tar.zst meta/`); turn it back on
+     again.  This will allow you to take a backup of all nodes without
+     impacting global cluster availability.  You can do all nodes of a single
+     zone at once as this does not impact the availability of Garage.
+
+3. Prepare your updated binaries and configuration files for Garage v2.0.
+   **Remember to update your configuration file to remove `replication_mode` and replace it by `replication_factor`.**
+
+4. Shut down all v1.0 nodes simultaneously, and restart them all simultaneously
+   in v2.0.  Use your favorite deployment tool (Ansible, Kubernetes, Nomad) to
+   achieve this as fast as possible.  Garage v2.0 should be in a working state
+   as soon as enough nodes have started.
+
+5. Monitor your cluster in the following hours to see if it works well under
+   your production load.
@@ -1,6 +1,6 @@
 +++
 title = "Testing strategy"
-weight = 30
+weight = 100
 +++


@@ -28,11 +28,11 @@ We should try to test in least invasive ways, i.e. minimize the impact of the te
 - Not making `garage` a shared library (launch using `execve`, it's perfectly fine)

 Instead, we should focus on building a clean outer interface for the `garage` binary,
-for example loading configuration using environnement variables instead of the configuration file if that's helpfull for writing the tests.
+for example loading configuration using environment variables instead of the configuration file if that's helpful for writing the tests.

 There are two reasons for this:

- Keep the soure code clean and focused
+- Keep the source code clean and focused
 - Test something that is as close as possible as the true garage that will actually be running

 Reminder: rules of simplicity, concerning changes to Garage's source code.
@@ -71,5 +71,3 @@ Interesting blog posts on the blog of the Sled database:
 Misc:
  - [mutagen](https://github.com/llogiq/mutagen) - mutation testing is a way to assert our test quality by mutating the code and see if the mutation makes the tests fail
  - [fuzzing](https://rust-fuzz.github.io/book/) - cargo supports fuzzing, it could be a way to test our software reliability in presence of garbage data.
-  
-
@@ -176,7 +176,7 @@ Returns the cluster's current health in JSON format, with the following variable
  - degraded: Garage node is not connected to all storage nodes, but a quorum of write nodes is available for all partitions
  - unavailable: a quorum of write nodes is not available for some partitions
 - `knownNodes`: the number of nodes this Garage node has had a TCP connection to since the daemon started
- `connectedNodes`: the nubmer of nodes this Garage node currently has an open connection to
+- `connectedNodes`: the number of nodes this Garage node currently has an open connection to
 - `storageNodes`: the number of storage nodes currently registered in the cluster layout
 - `storageNodesOk`: the number of storage nodes to which a connection is currently open
 - `partitions`: the total number of partitions of the data (currently always 256)
@@ -379,7 +379,7 @@ Example response:
 ]
 ```

-#### GetKeyInfo `GET /v2/GetKeyInfo?id=<acces key id>`
+#### GetKeyInfo `GET /v2/GetKeyInfo?id=<access key id>`
 #### GetKeyInfo `GET /v2/GetKeyInfo?search=<pattern>`

 Returns information about the requested API access key.
@@ -388,7 +388,7 @@ If `id` is set, the key is looked up using its exact identifier (faster).
 If `search` is set, the key is looked up using its name or prefix
 of identifier (slower, all keys are enumerated to do this).

-Optionnally, the query parameter `showSecretKey=true` can be set to reveal the
+Optionally, the query parameter `showSecretKey=true` can be set to reveal the
 associated secret access key.

 Example response:
@@ -487,7 +487,7 @@ Request body format:

 This returns the key info in the same format as the result of GetKeyInfo.

-#### UpdateKey `POST /v2/UpdateKey?id=<acces key id>`
+#### UpdateKey `POST /v2/UpdateKey?id=<access key id>`

 Updates information about the specified API access key.

@@ -509,7 +509,7 @@ The possible flags in `allow` and `deny` are: `createBucket`.

 This returns the key info in the same format as the result of GetKeyInfo.

-#### DeleteKey `POST /v2/DeleteKey?id=<acces key id>`
+#### DeleteKey `POST /v2/DeleteKey?id=<access key id>`

 Deletes an API access key.

@@ -35,7 +35,7 @@ Triples in K2V are constituted of three fields:
  partition key in which the client wants to read/delete lists of items

 - a sort key (`sk`), an utf8 string that defines the index of the triplet inside its
-  partition; triplets are uniquely idendified by their partition key + sort key
+  partition; triplets are uniquely identified by their partition key + sort key

 - a value (`v`), an opaque binary blob associated to the partition key + sort key;
  they are transmitted as binary when possible but in most case in the JSON API
@@ -74,7 +74,7 @@ are obsoleted by the new write.

 **Basic insertion.** To insert a new value `v4` with context `[(node1, t2), (node2, t3)]`, in a
 simple case where there was no insertion in-between reading the value
-mentionned above and writing `v4`, and supposing that node2 receives the
+mentioned above and writing `v4`, and supposing that node2 receives the
 InsertItem query:

 - `node2` generates a timestamp `t4` such that `t4 > t3`.
@@ -332,7 +332,7 @@ Inserts a single item. This request does not use JSON, the body is sent directly

 To supersede previous values, the HTTP header `X-Garage-Causality-Token` should
 be set to the causality token returned by a previous read on this key. This
-header can be ommitted for the first writes to the key.
+header can be omitted for the first writes to the key.

 Example query:

@@ -397,7 +397,7 @@ smallest partition key that exists.  It returns partition keys in increasing
 order, or decreasing order if `reverse` is set to `true`,
 and stops when either of the following conditions is met:

-1. if `end` is specfied, the partition key `end` is reached or surpassed (if it
+1. if `end` is specified, the partition key `end` is reached or surpassed (if it
   is reached exactly, it is not included in the result)

 2. if `limit` is specified, `limit` partition keys have been listed
@@ -491,7 +491,7 @@ the triplet is inserted for the first time, the causality token should be set to

 The value is expected to be a base64-encoded binary blob. The value `null` can
 also be used to delete the triplet while preserving causality information: this
-allows to know if a delete has happenned concurrently with an insert, in which
+allows to know if a delete has happened concurrently with an insert, in which
 case both are preserved and returned on reads (see below).

 Partition keys and sort keys are utf8 strings which are stored sorted by
@@ -540,7 +540,7 @@ JSON struct with the following fields:

 For each of the searches, triplets are listed and returned separately. The
 semantics of `prefix`, `start`, `end`, `limit` and `reverse` are the same as for ReadIndex. The
-additionnal parameter `singleItem` allows to get a single item, whose sort key
+additional parameter `singleItem` allows to get a single item, whose sort key
 is the one given in `start`. Parameters `conflictsOnly` and `tombstones`
 control additional filters on the items that are returned.

@@ -59,7 +59,7 @@ To link the effective storage capacity of the cluster to partition assignment, w
 \end{equation}
 This assumption is justified by the dispersion of the hashing function, when the number of partitions is small relative to the number of stored blocks.

-Every node $n$ wille store some number $p_n$ of partitions (it is the number of partitions $p$ such that $n$ appears in the $\alpha_p$). Hence the partitions stored by $n$ (and hence all partitions by our assumption) have there size bounded by $c_n/p_n$. This remark leads us to define the optimal size that we will want to maximize:
+Every node $n$ will store some number $p_n$ of partitions (it is the number of partitions $p$ such that $n$ appears in the $\alpha_p$). Hence the partitions stored by $n$ (and hence all partitions by our assumption) have there size bounded by $c_n/p_n$. This remark leads us to define the optimal size that we will want to maximize:

 \begin{equation}
 	\label{eq:optimal}
@@ -38,7 +38,7 @@ We would like to compute an assignment of nodes to partitions. We will impose so
 \end{equation}
 This assumption is justified by the dispersion of the hashing function, when the number of partitions is small relative to the number of stored large objects.

-Every node $n$ wille store some number $k_n$ of partitions. Hence the partitions stored by $n$ (and hence all partitions by our assumption) have there size bounded by $c_n/k_n$. This remark leads us to define the optimal size that we will want to maximize:
+Every node $n$ will store some number $k_n$ of partitions. Hence the partitions stored by $n$ (and hence all partitions by our assumption) have there size bounded by $c_n/k_n$. This remark leads us to define the optimal size that we will want to maximize:

 \begin{equation}
 	\label{eq:optimal}
@@ -62,7 +62,7 @@ For now, in the following, we ask the following redundancy constraint:

 \textbf{Mode 3:} every partition needs to be assignated to three nodes. We try to spread the three nodes over different zones as much as possible.

-\textbf{Warning:} This is a working document written incrementaly. The last version of the algorithm is the \textbf{parametric assignment} described in the next section.
+\textbf{Warning:} This is a working document written incrementally. The last version of the algorithm is the \textbf{parametric assignment} described in the next section.


 \section{Computation of a parametric assignment}
@@ -318,7 +318,7 @@ $$
 $$
 which is the universal upper bound on $s^*$. Hence any optimal utilization $(n_v)$ can be modified to another optimal utilization such that $n_v\ge \hat{n}_v$

-Because $z_0$ cannot store more than $N$ partition occurences, in any assignment, at least $2N$ partitions must be assignated to the zones $Z\setminus\{z_0\}$. Let $C_0 = C-c_{z_0}$. Suppose that there exists a zone $z_1\neq z_0$ such that $c_{z_1}/C_0 \ge 1/2$. Then, with the same argument as for $z_0$, we can define 
+Because $z_0$ cannot store more than $N$ partition occurrences, in any assignment, at least $2N$ partitions must be assignated to the zones $Z\setminus\{z_0\}$. Let $C_0 = C-c_{z_0}$. Suppose that there exists a zone $z_1\neq z_0$ such that $c_{z_1}/C_0 \ge 1/2$. Then, with the same argument as for $z_0$, we can define
 $$\hat{n}_v = \left\lfloor\frac{c_v}{c_{z_1}}N\right\rfloor$$
 for every $v\in z_1$.

@@ -351,7 +351,7 @@ Define $3N$ tokens $t_1,\ldots, t_{3N}\in V$ as follows:
 Then for $1\le i \le N$, define the triplet $T_i$ to be 
 $(t_i, t_{i+N}, t_{i+2N})$. Since the same nodes of a zone appear contiguously, the three nodes of a triplet must belong to three distinct zones.

-However simple, this solution to go from an utilization to an assignment has the drawback of not spreading the triplets: a node will tend to be associated to the same two other nodes for many partitions. Hence, during data transfer, it will tend to use only two link, instead of spreading the bandwith use over many other links to other nodes. To achieve this goal, we will reframe the search of an assignment as a flow problem. and in the flow algorithm, we will introduce randomness in the order of exploration. This will be sufficient to obtain a good dispersion of the triplets.
+However simple, this solution to go from an utilization to an assignment has the drawback of not spreading the triplets: a node will tend to be associated to the same two other nodes for many partitions. Hence, during data transfer, it will tend to use only two link, instead of spreading the bandwidth use over many other links to other nodes. To achieve this goal, we will reframe the search of an assignment as a flow problem. and in the flow algorithm, we will introduce randomness in the order of exploration. This will be sufficient to obtain a good dispersion of the triplets.

 \begin{figure}
 	\centering
@@ -436,7 +436,7 @@ T_3=(b,c,d').
 $$
 One can check that in this case, it is impossible to minimize both the number of zone and node changes.

-Because of the redundancy constraint, we cannot use a greedy algorithm to just replace nodes in the triplets to try to get the new utilization rate: this could lead to blocking situation where there is still a hole to fill in a triplet but no available node satisfies the zone separation constraint. To circumvent this issue, we propose an algorithm based on finding cycles in a graph encoding of the assignment. As in section \ref{sec:opt_assign}, we can explore the neigbours in a random order in the graph algorithms, to spread the triplets distribution.
+Because of the redundancy constraint, we cannot use a greedy algorithm to just replace nodes in the triplets to try to get the new utilization rate: this could lead to blocking situation where there is still a hole to fill in a triplet but no available node satisfies the zone separation constraint. To circumvent this issue, we propose an algorithm based on finding cycles in a graph encoding of the assignment. As in section \ref{sec:opt_assign}, we can explore the neighbours in a random order in the graph algorithms, to spread the triplets distribution.


 \subsubsection{Minimizing the zone discrepancy}
@@ -550,8 +550,8 @@ We give some considerations of worst case complexity for these algorithms. In th
 Algorithm \ref{alg:util} can be implemented with complexity $O(\#V^2)$. The complexity of the function call at line \ref{lin:subutil} is $O(\#V)$. The difference between the sum of the subutilizations and $3N$ is at most the sum of the rounding errors when computing the $\hat{n}_v$. Hence it is bounded by $\#V$ and the loop at line \ref{lin:loopsub} is iterated at most $\#V$ times. Finding the minimizing $v$ at line \ref{lin:findmin} takes $O(\#V)$ operations (naively, we could also use a heap).

 Algorithm \ref{alg:opt} can be implemented with complexity $O(N^3\times \#Z)$. The flow graph has $O(N+\#Z)$ vertices and $O(N\times \#Z)$ edges. Dinic's algorithm has complexity $O(\#\mathrm{Vertices}^2\#\mathrm{Edges})$ hence in our case it is $O(N^3\times \#Z)$.
- 
-Algorithm \ref{alg:mini} can be implented with complexity $O(N^3\# Z)$ under \eqref{hyp:A} and $O(N^3 \#Z \#V)$ under \eqref{hyp:B}.
+
+Algorithm \ref{alg:mini} can be implemented with complexity $O(N^3\# Z)$ under \eqref{hyp:A} and $O(N^3 \#Z \#V)$ under \eqref{hyp:B}.
 The graph $G_T$ has $O(N)$ vertices and $O(N\times \#Z)$ edges under assumption \eqref{hyp:A} and respectively $O(N\times \#Z)$ vertices and $O(N\times \#V)$ edges under assumption \eqref{hyp:B}. The loop at line \ref{lin:repeat} is iterated at most $N$ times since the distance between $T$ and $T'$ decreases at every iteration. Bellman-Ford algorithm has complexity $O(\#\mathrm{Vertices}\#\mathrm{Edges})$, which in our case amounts to $O(N^2\# Z)$ under \eqref{hyp:A} and $O(N^2 \#Z \#V)$ under \eqref{hyp:B}.
 
 \begin{algorithm}
@@ -637,7 +637,7 @@ We try to maximize $s^*$ defined in \eqref{eq:optimal}. So we can compute the op

 \subsection{Computation of a candidate assignment}

-To compute a candidate assignment (that does not optimize zone spreading nor distance to a previous assignment yet), we can use the folowing flow problem.
+To compute a candidate assignment (that does not optimize zone spreading nor distance to a previous assignment yet), we can use the following flow problem.

 Define the oriented weighted graph $(X,E)$. The set of vertices $X$ contains the source $\mathbf{s}$, the sink $\mathbf{t}$, vertices 
 $\mathbf{x}_p, \mathbf{u}^+_p, \mathbf{u}^-_p$ for every partition $p$, vertices $\mathbf{y}_{p,z}$ for every partition $p$ and zone $z$, and vertices $\mathbf{z}_v$ for every node $v$. 
@@ -680,14 +680,14 @@ Given the flow $f$, let $G_f=(X',E_f)$ be the multi-graph where $X' = X\setminus
 \end{itemize}
 To summarize, arcs are oriented left to right if they correspond to a presence of flow in $f$, and right to left if they correspond to an absence of flow. They are positively weighted if we want them to stay at their current state, and negatively if we want them to switch. Let us compute the weight of such graph.

-\begin{multline*}
+\begin{multiline*}
 	w(G_f)  = \sum_{e\in E_f} w(e_f)  \\
 	= 
 	(\alpha - \beta -\gamma) N_1 + (\alpha +\beta - \gamma) N_2 + (\alpha+\beta+\gamma) N_3 
 	\\ + 
 	\#V\times N - 4 \sum_p 3-\#(T_p\cap T'_p) \\ 
 	=(\#V-12+\alpha-\beta-\gamma)\times N + 4Q_V + 2\beta N_2 + 2(\beta+\gamma) N_3 \\
-\end{multline*}
+\end{multiline*}

 As for the mode 3-strict, one can check that the difference of two such graphs corresponding to the same $(n_v)$ is always eulerian. Hence we can navigate in this class with the same greedy algorithm that discovers positive cycles and flips them.

@@ -0,0 +1,17 @@
+*
+
+!*.txt
+!*.md
+
+!assets
+
+!.gitignore
+!*.svg
+!*.png
+!*.jpg
+!*.tex
+!Makefile
+!.gitignore
+!assets/*.drawio.pdf
+
+!talk.pdf
@@ -0,0 +1,19 @@
+ASSETS=../assets/lattice/lattice1.pdf_tex \
+	   ../assets/lattice/lattice2.pdf_tex \
+	   ../assets/lattice/lattice3.pdf_tex \
+	   ../assets/lattice/lattice4.pdf_tex \
+	   ../assets/lattice/lattice5.pdf_tex \
+	   ../assets/lattice/lattice6.pdf_tex \
+	   ../assets/lattice/lattice7.pdf_tex \
+	   ../assets/lattice/lattice8.pdf_tex \
+	   ../assets/logos/deuxfleurs.pdf \
+	   ../assets/timeline-22-24.pdf
+
+talk.pdf: talk.tex $(ASSETS)
+	pdflatex talk.tex
+
+%.pdf: %.svg
+	inkscape -D -z --file=$^ --export-pdf=$@
+
+%.pdf_tex: %.svg
+	inkscape -D -z --file=$^ --export-pdf=$@ --export-latex
@@ -0,0 +1,702 @@
+\nonstopmode
+\documentclass[aspectratio=169,xcolor={svgnames}]{beamer}
+\usepackage[utf8]{inputenc}
+% \usepackage[frenchb]{babel}
+\usepackage{amsmath}
+\usepackage{mathtools}
+\usepackage{breqn}
+\usepackage{multirow}
+\usetheme{boxes}
+\usepackage{graphicx}
+\usepackage{import}
+\usepackage{adjustbox}
+\usepackage[absolute,overlay]{textpos}
+%\useoutertheme[footline=authortitle,subsection=false]{miniframes}
+%\useoutertheme[footline=authorinstitute,subsection=false]{miniframes}
+\useoutertheme{infolines}
+\setbeamertemplate{headline}{}
+
+\beamertemplatenavigationsymbolsempty
+
+\definecolor{TitleOrange}{RGB}{255,137,0}
+\setbeamercolor{title}{fg=TitleOrange}
+\setbeamercolor{frametitle}{fg=TitleOrange}
+
+\definecolor{ListOrange}{RGB}{255,145,5}
+\setbeamertemplate{itemize item}{\color{ListOrange}$\blacktriangleright$}
+
+\definecolor{verygrey}{RGB}{70,70,70}
+\setbeamercolor{normal text}{fg=verygrey}
+
+
+\usepackage{tabu}
+\usepackage{multicol}
+\usepackage{vwcol}
+\usepackage{stmaryrd}
+\usepackage{graphicx}
+
+\usepackage[normalem]{ulem}
+
+\AtBeginSection[]{
+  \begin{frame}
+  \vfill
+  \centering
+  \begin{beamercolorbox}[sep=8pt,center,shadow=true,rounded=true]{title}
+    \usebeamerfont{title}\insertsectionhead\par%
+  \end{beamercolorbox}
+  \vfill
+  \end{frame}
+}
+
+\title{Garage, an S3 backend as reliable as possible}
+\author{Garage Authors}
+\date{JoSy S3, 2025-10-08}
+
+\begin{document}
+
+\begin{frame}
+	\centering
+	\includegraphics[width=.3\linewidth]{../../sticker/Garage.png}
+	\vspace{1em}
+
+	{\large\bf Garage, an S3 backend as reliable as possible}
+	\vspace{1em}
+
+		\url{https://garagehq.deuxfleurs.fr/}\\
+		\url{mailto:garagehq@deuxfleurs.fr}\\
+		\texttt{\#garage:deuxfleurs.fr} on Matrix
+\end{frame}
+
+
+\section{Meet Garage}
+
+\begin{frame}
+	\frametitle{A non-profit initiative}
+
+
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.5\linewidth, valign=t]{../assets/logos/deuxfleurs.pdf}
+		\end{column}
+		\begin{column}{.8\textwidth}
+			\textbf{Part of a degrowth initiative}\\
+			Garage has been created at Deuxfleurs where we experiment running Internet services without datacenter on commodity and refurbished hardware.
+		\end{column}
+
+	\end{columns}
+	\vspace{2em}
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.5\linewidth, valign=t]{../assets/community.png}
+		\end{column}
+		\begin{column}{.8\textwidth}
+			\textbf{Developed by a community}\\
+			{\small Some recent contributors: Arthur C, Charles H, dongdigua, Etienne L, Jonah A, Julien K, Lapineige, MagicRR, Milas B, Niklas M, RockWolf, Schwitzd, trinity-1686a, Xavier S,  babykart, Baptiste J, eddster2309, James O'C, Joker9944, Maximilien R, Renjaya RZ, Yureka...}
+		\end{column}
+
+	\end{columns}
+	\vspace{2em}
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.5\linewidth, valign=t]{../assets/logos/AGPLv3_Logo.png}
+		\end{column}
+		\begin{column}{.8\textwidth}
+			\textbf{Owned by nobody, open-core is impossible, zero VC money}\\
+			AGPL + no Contributor License Agreement = Garage ownership spreads among hundredth of contributors.
+		\end{column}
+
+	\end{columns}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Getting support for Garage}
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.4\linewidth, valign=t]{../assets/alex.jpg}
+		\end{column}
+		\begin{column}{.4\textwidth}
+			\textbf{Alex Auvolat}\\
+			PhD; co-founder of Deuxfleurs\\
+			Garage maintainer, Freelance
+		\end{column}
+		\begin{column}{.3\textwidth}
+			\centering
+			\adjincludegraphics[width=.4\linewidth, valign=t]{../assets/support.png}
+		\end{column}
+		\begin{column}{.1\textwidth}
+			~
+		\end{column}
+	\end{columns}
+	\vspace{2em}
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.4\linewidth, valign=t]{../assets/quentin.jpg}
+		\end{column}
+		\begin{column}{.4\textwidth}
+			\textbf{Quentin Dufour}\\
+			PhD; co-founder of Deuxfleurs\\
+			Garage contributor, Freelance
+		\end{column}
+		\begin{column}{.4\textwidth}
+			For support requests, write at: \\
+			\url{garagehq@deuxfleurs.fr}
+		\end{column}
+	\end{columns}
+	\vspace{2em}
+	\begin{columns}[t]
+		\begin{column}{.2\textwidth}
+			\centering
+			\adjincludegraphics[width=.4\linewidth, valign=t]{../assets/armael.jpg}
+		\end{column}
+		\begin{column}{.4\textwidth}
+			\textbf{Armaël Guéneau}\\
+			PhD; member of Deuxfleurs\\
+			Garage contributor, Freelance
+		\end{column}
+		\begin{column}{.4\textwidth}
+			Eligible: email support, architecture design, specific feature development, etc.
+		\end{column}
+	\end{columns}
+
+
+\end{frame}
+
+\begin{frame}
+	\frametitle{Our initial goal}
+
+	\centering
+	\Large
+
+	Being a self-sovereign community to be free of our degrowth choice
+
+	$\big\downarrow$
+
+	As web citizens, datacenters are big black boxes. \\
+	We want to leave them to autonoumously manage our servers.
+
+	$\big\downarrow$
+
+	We want reliable services without relying on dedicated hardware or places.
+
+\end{frame}
+
+\begin{frame}
+	\frametitle{Building a resilient system with cheap stuff}
+
+	\only<1,4-7>{
+		\begin{itemize}
+			\item \textcolor<5->{gray}{Commodity hardware (e.g. old desktop PCs)\\
+				\vspace{.5em}
+				\visible<4->{{\footnotesize (can die at any time)}}}
+				\vspace{1.5em}
+			\item<5-> \textcolor<7->{gray}{Regular Internet (e.g. FTTB, FTTH) and power grid connections\\
+				\vspace{.5em}
+				\visible<6->{{\footnotesize (can be unavailable randomly)}}}
+				\vspace{1.5em}
+			\item<7-> \textbf{Geographical redundancy} (multi-site replication)
+		\end{itemize}
+	}
+	\only<2>{
+		\begin{center}
+			\includegraphics[width=.8\linewidth]{../assets/neptune.jpg}
+		\end{center}
+	}
+	\only<3>{
+		\begin{center}
+			\includegraphics[width=.8\linewidth]{../assets/atuin.jpg}
+		\end{center}
+	}
+	\only<8>{
+		\begin{center}
+			\includegraphics[width=.8\linewidth]{../assets/inframap_jdll2023.pdf}
+		\end{center}
+	}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Object storage: a crucial component}
+		\begin{center}
+			\includegraphics[height=6em]{../assets/logos/Amazon-S3.jpg}
+			\hspace{3em}
+			\visible<2->{\includegraphics[height=5em]{../assets/logos/minio.png}}
+			\hspace{3em}
+			\visible<3>{\includegraphics[height=6em]{../../logo/garage_hires_crop.png}}
+		\end{center}
+		\vspace{1em}
+	S3: a de-facto standard, many compatible applications
+
+	\vspace{1em}
+	\visible<2->{MinIO is self-hostable but not suited for geo-distributed deployments}
+
+	\vspace{1em}
+	\visible<3->{\textbf{Garage is a self-hosted drop-in replacement for the Amazon S3 object store}}
+\end{frame}
+
+\begin{frame}
+	\frametitle{CRDTs / weak consistency instead of consensus}
+
+	\underline{Internally, Garage uses only CRDTs} (conflict-free replicated data types)
+
+	\vspace{2em}
+	Why not Raft, Paxos, ...? Issues of consensus algorithms:
+
+	\vspace{1em}
+	\begin{itemize}
+		\item<2-> \textbf{Software complexity}
+			\vspace{1em}
+		\item<3-> \textbf{Performance issues:}
+			\vspace{.5em}
+			\begin{itemize}
+				\item<4-> The leader is a \textbf{bottleneck} for all requests\\
+					\vspace{.5em}
+				\item<5-> \textbf{Sensitive to higher latency} between nodes
+					\vspace{.5em}
+				\item<6-> \textbf{Takes time to reconverge} when disrupted (e.g. node going down)
+			\end{itemize}
+	\end{itemize}
+\end{frame}
+
+\begin{frame}
+	\frametitle{The data model of object storage}
+	Object storage is basically a \textbf{key-value store}:
+	\vspace{.5em}
+
+	{\scriptsize
+		\begin{center}
+		\begin{tabular}{|l|p{7cm}|}
+			\hline
+			\textbf{Key: file path + name} & \textbf{Value: file data + metadata} \\
+			\hline
+			\hline
+			\texttt{index.html} &
+				\texttt{Content-Type: text/html; charset=utf-8} \newline
+				\texttt{Content-Length: 24929} \newline
+				\texttt{<binary blob>} \\ 
+			\hline
+			\texttt{img/logo.svg} &
+				\texttt{Content-Type: text/svg+xml} \newline
+				\texttt{Content-Length: 13429} \newline
+				\texttt{<binary blob>} \\ 
+			\hline
+			\texttt{download/index.html} &
+				\texttt{Content-Type: text/html; charset=utf-8} \newline
+				\texttt{Content-Length: 26563} \newline
+				\texttt{<binary blob>} \\ 
+			\hline
+		\end{tabular}
+		\end{center}
+		}
+
+	\vspace{1em}
+	\begin{itemize}
+		\item<2> Maps well to CRDT data types
+	\end{itemize}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Performance gains in practice}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/perf/endpoint_latency_0.7_0.8_minio.png}
+	\end{center}
+\end{frame}
+
+% ======================================== OPERATING
+% ======================================== OPERATING
+% ======================================== OPERATING
+
+
+\section{Production clusters}
+
+\begin{frame}
+	\frametitle{Deployment kinds}
+
+	\includegraphics[width=.9\linewidth]{../assets/cluster_kind.png}
+	\vspace{1em}
+	
+\end{frame}
+
+\begin{frame}
+	\frametitle{How big they are?}
+
+	\includegraphics[width=.9\linewidth]{../assets/cluster_size.png}
+	\vspace{1em}
+
+	\textit{"Petabyte storage setup for a video site. Nginx as CDN in-front using garage-s3-website feature. Each storage node has ~64TB storage with raid10, no replication within garage. 25gbit nic. haproxy to loadbalance across 5 nodes. mostly reads with very few writes."}
+
+	\vspace{1em}
+	\textit{"We currently manage 7 Garage nodes, 28TB total storage, 6M blocks for 3M objects and 4TB of object data. We have been running Garage in production for 2.5 years."}
+
+\end{frame}
+
+\begin{frame}
+	\frametitle{Operating Garage}
+	\begin{center}
+		\only<1-2>{
+			\includegraphics[width=.9\linewidth]{../assets/screenshots/garage_status_0.10.png}
+			\\\vspace{1em}
+			\visible<2>{\includegraphics[width=.9\linewidth]{../assets/screenshots/garage_status_unhealthy_0.10.png}}
+		}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Garage's architecture}
+	\begin{center}
+		\only<1>{\includegraphics[width=.45\linewidth]{../assets/garage.drawio.pdf}}%
+		\only<2>{\includegraphics[width=.6\linewidth]{../assets/garage_sync.drawio.pdf}}%
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Digging deeper}
+	\begin{center}
+		\only<1>{\includegraphics[width=.9\linewidth]{../assets/screenshots/garage_stats_0.10.png}}
+		\only<2>{\includegraphics[width=.5\linewidth]{../assets/screenshots/garage_worker_list_0.10.png}}
+		\only<3>{\includegraphics[width=.6\linewidth]{../assets/screenshots/garage_worker_param_0.10.png}}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Potential limitations and bottlenecks}
+	\begin{itemize}
+		\item Global:
+			\begin{itemize}
+				\item Max. $\sim$100 nodes per cluster (excluding gateways)
+			\end{itemize}
+			\vspace{1em}
+		\item Metadata:
+			\begin{itemize}
+				\item One big bucket = bottleneck, object list on 3 nodes only
+			\end{itemize}
+			\vspace{1em}
+		\item Block manager:
+			\begin{itemize}
+				\item Lots of small files on disk
+				\item Processing the resync queue can be slow
+			\end{itemize}
+	\end{itemize}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Deployment advice for very large clusters}
+	\begin{itemize}
+		\item Metadata storage:
+			\begin{itemize}
+				\item ZFS mirror (x2) on fast NVMe
+				\item Use LMDB storage engine
+			\end{itemize}
+			\vspace{.5em}
+		\item Data block storage:
+			\begin{itemize}
+				\item Use Garage's native multi-HDD support
+				\item XFS on individual drives
+				\item Increase block size (1MB $\to$ 10MB, requires more RAM and good networking)
+				\item Tune \texttt{resync-tranquility} and \texttt{resync-worker-count} dynamically
+			\end{itemize}
+			\vspace{.5em}
+		\item Other :
+			\begin{itemize}
+				\item Split data over several buckets
+				\item Use less than 100 storage nodes
+				\item Use gateway nodes
+			\end{itemize}
+			\vspace{.5em}
+	\end{itemize}
+\end{frame}
+
+
+\begin{frame}
+	\frametitle{Focus on Deuxfleurs}
+
+	Host institutional websites, partnership with a web agency.
+	Matrix media backend.
+
+	Plan to use it as an email backend for an internally developed email server.
+
+\end{frame}
+
+
+% ======================================== TIMELINE
+% ======================================== TIMELINE
+% ======================================== TIMELINE
+
+\section{Recent developments}
+
+% ====================== v0.7.0 ===============================
+
+\begin{frame}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/tl.drawio.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{April 2022 - Garage v0.7.0}
+	Focus on \underline{observability and ecosystem integration}
+	\vspace{2em}
+	\begin{itemize}
+		\item \textbf{Monitoring:} metrics and traces, using OpenTelemetry
+			\vspace{1em}
+		\item Replication modes with 1 or 2 copies / weaker consistency
+			\vspace{1em}
+		\item Kubernetes integration for node discovery
+			\vspace{1em}
+		\item Admin API (v0.7.2)
+	\end{itemize}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Metrics (Prometheus + Grafana)}
+	\begin{center}
+		\includegraphics[width=.9\linewidth]{../assets/screenshots/grafana_dashboard.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Traces (Jaeger)}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/screenshots/jaeger_listobjects.png}
+	\end{center}
+\end{frame}
+
+% ====================== v0.8.0 ===============================
+
+\begin{frame}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/tl.drawio.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{November 2022 - Garage v0.8.0}
+	Focus on \underline{performance}
+	\vspace{2em}
+	\begin{itemize}
+		\item \textbf{Alternative metadata DB engines} (LMDB, Sqlite)
+			\vspace{1em}
+		\item \textbf{Performance improvements:} block streaming, various optimizations...
+			\vspace{1em}
+		\item Bucket quotas (max size, max \#objects)
+			\vspace{1em}
+		\item Quality of life improvements, observability, etc.
+	\end{itemize}
+\end{frame}
+
+\begin{frame}
+	\frametitle{About metadata DB engines}
+	\textbf{Issues with Sled:}
+	\vspace{1em}
+	\begin{itemize}
+		\item Huge files on disk
+			\vspace{.5em}
+		\item Unpredictable performance, especially on HDD
+			\vspace{.5em}
+		\item API limitations
+			\vspace{.5em}
+		\item Not actively maintained
+	\end{itemize}
+
+	\vspace{2em}
+	\textbf{LMDB:} very stable, good performance, file size is reasonable\\
+	\textbf{Sqlite} also available as a second choice
+
+	\vspace{1em}
+	Sled will be removed in Garage v1.0
+\end{frame}
+
+\begin{frame}
+	\frametitle{DB engine performance comparison}
+	\begin{center}
+		\includegraphics[width=.6\linewidth]{../assets/perf/db_engine.png}
+	\end{center}
+	NB: Sqlite was slow due to synchronous mode, now configurable
+\end{frame}
+
+\begin{frame}
+	\frametitle{Block streaming}
+	\begin{center}
+		\only<1>{\includegraphics[width=.8\linewidth]{../assets/schema-streaming-1.png}}
+		\only<2>{\includegraphics[width=.8\linewidth]{../assets/schema-streaming-2.png}}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{TTFB benchmark}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/perf/ttfb.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Throughput benchmark}
+	\begin{center}
+		\includegraphics[width=.7\linewidth]{../assets/perf/io-0.7-0.8-minio.png}
+	\end{center}
+\end{frame}
+
+% ====================== v0.9.0 ===============================
+
+\begin{frame}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/tl.drawio.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{October 2023 - Garage v0.9.0}
+	Focus on \underline{streamlining \& usability}
+	\vspace{2em}
+	\begin{itemize}
+		\item Support multiple HDDs per node
+			\vspace{1em}
+		\item S3 compatibility: 
+			\vspace{1em}
+			\begin{itemize}
+				\item support basic lifecycle configurations
+					\vspace{.5em}
+				\item allow for multipart upload part retries
+			\end{itemize}
+			\vspace{1em}
+		\item LMDB by default, deprecation of Sled
+			\vspace{1em}
+		\item New layout computation algorithm
+	\end{itemize}
+\end{frame}
+
+
+\begin{frame}
+	\frametitle{Layout computation}
+	\begin{overprint}
+		\onslide<1>
+		\begin{center}
+			\includegraphics[width=\linewidth, trim=0 0 0 -4cm]{../assets/screenshots/garage_status_0.9_prod_zonehl.png}
+		\end{center}
+		\onslide<2>
+		\begin{center}
+			\includegraphics[width=.7\linewidth]{../assets/map.png}
+		\end{center}
+	\end{overprint}
+	\vspace{1em}
+	Garage stores replicas on different zones when possible
+\end{frame}
+
+\begin{frame}
+	\frametitle{What a "layout" is}
+		\textbf{A layout is a precomputed index table:}
+		\vspace{1em}
+
+		{\footnotesize
+			\begin{center}
+			\begin{tabular}{|l|l|l|l|}
+				\hline
+				\textbf{Partition} & \textbf{Node 1} & \textbf{Node 2} & \textbf{Node 3} \\
+				\hline
+				\hline
+				Partition 0 & df-ymk (bespin) & Abricot (scorpio) & Courgette (neptune) \\
+				\hline
+				Partition 1 & Ananas (scorpio) & Courgette (neptune) & df-ykl (bespin) \\
+				\hline
+				Partition 2 & df-ymf (bespin) & Celeri (neptune) & Abricot (scorpio) \\
+				\hline
+				\hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ \\
+				\hline
+				Partition 255 & Concombre (neptune) & df-ykl (bespin) & Abricot (scorpio) \\
+				\hline
+			\end{tabular}
+			\end{center}
+		}
+
+	\vspace{2em}
+	\visible<2->{
+		The index table is built centrally using an optimal algorithm,\\
+		then propagated to all nodes
+	}
+
+	\vspace{1em}
+	\visible<3->{
+		\footnotesize
+		Oulamara, M., \& Auvolat, A. (2023). \emph{An algorithm for geo-distributed and redundant storage in Garage}.\\ arXiv preprint arXiv:2302.13798.
+	}
+\end{frame}
+
+
+
+% ====================== v1.0.0 ===============================
+
+\begin{frame}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/tl.drawio.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{April 2024 - Garage v1.0.0}
+	Focus on \underline{consistency, security \& stability}
+	\vspace{2em}
+	\begin{itemize}
+		\item Fix consistency issues when reshuffling data (Jepsen testing)
+			\vspace{1em}
+		\item \textbf{Security audit} by Radically Open Security
+			\vspace{1em}
+		\item Misc. S3 features (SSE-C, checksums,  ...) and compatibility fixes
+	\end{itemize}
+\end{frame}
+
+% ====================== v2.0.0 ===============================
+
+\begin{frame}
+	\begin{center}
+		\includegraphics[width=.8\linewidth]{../assets/tl.drawio.png}
+	\end{center}
+\end{frame}
+
+\begin{frame}
+	\frametitle{Garage v2.0.0}
+	Focus on \underline{}
+	\vspace{2em}
+	\begin{itemize}
+		\item TODO
+	\end{itemize}
+\end{frame}
+
+
+\begin{frame}
+	\frametitle{Currently funding...}
+
+	\textit{...}
+\end{frame}
+
+\begin{frame}
+	\frametitle{We run community surveys}
+	\begin{center}
+		\includegraphics[width=.6\linewidth]{../assets/survey_requested_features.png}
+	\end{center}
+\end{frame}
+
+% ======================================== END
+% ======================================== END
+% ======================================== END
+
+\begin{frame}
+	\frametitle{Where to find us}
+	\begin{center}
+			\includegraphics[width=.25\linewidth]{../../logo/garage_hires.png}\\
+			\vspace{-1em}
+		\url{https://garagehq.deuxfleurs.fr/}\\
+		\url{mailto:garagehq@deuxfleurs.fr}\\
+		\texttt{\#garage:deuxfleurs.fr} on Matrix
+
+		\vspace{1.5em}
+			\includegraphics[width=.06\linewidth]{../assets/logos/rust_logo.png}
+			\includegraphics[width=.13\linewidth]{../assets/logos/AGPLv3_Logo.png}
+	\end{center}
+\end{frame}
+
+\end{document}
+
+%% vim: set ts=4 sw=4 tw=0 noet spelllang=en :
@@ -12,16 +12,17 @@
      "original": {
        "owner": "ipetkov",
        "repo": "crane",
+        "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527",
        "type": "github"
      }
    },
    "flake-compat": {
      "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "lastModified": 1761640442,
+        "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=",
        "owner": "nix-community",
        "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884",
        "type": "github"
      },
      "original": {
@@ -50,17 +51,17 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1747825515,
-        "narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=",
+        "lastModified": 1763977559,
+        "narHash": "sha256-g4MKqsIRy5yJwEsI+fYODqLUnAqIY4kZai0nldAP6EM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6",
+        "rev": "cfe2c7d5b5d3032862254e68c37a6576b633d632",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6",
+        "rev": "cfe2c7d5b5d3032862254e68c37a6576b633d632",
        "type": "github"
      }
    },
@@ -80,17 +81,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1738549608,
-        "narHash": "sha256-GdyT9QEUSx5k/n8kILuNy83vxxdyUfJ8jL5mMpQZWfw=",
+        "lastModified": 1763952169,
+        "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "35c6f8c4352f995ecd53896200769f80a3e8f22d",
+        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
        "type": "github"
      },
      "original": {
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "35c6f8c4352f995ecd53896200769f80a3e8f22d",
+        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
        "type": "github"
      }
    },
@@ -2,16 +2,17 @@
  description =
    "Garage, an S3-compatible distributed object store for self-hosted deployments";

-  # Nixpkgs 25.05 as of 2025-05-22
+  # Nixpkgs 25.05 as of 2025-11-24
  inputs.nixpkgs.url =
-    "github:NixOS/nixpkgs/cd2812de55cf87df88a9e09bf3be1ce63d50c1a6";
+    "github:NixOS/nixpkgs/cfe2c7d5b5d3032862254e68c37a6576b633d632";

-  # Rust overlay as of 2025-02-03
+  # Rust overlay as of 2025-11-24
  inputs.rust-overlay.url =
-  "github:oxalica/rust-overlay/35c6f8c4352f995ecd53896200769f80a3e8f22d";
+  "github:oxalica/rust-overlay/ab726555a9a72e6dc80649809147823a813fa95b";
  inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";

-  inputs.crane.url = "github:ipetkov/crane";
+  # Crane as of 2025-01-24
+  inputs.crane.url = "github:ipetkov/crane/6fe74265bbb6d016d663b1091f015e2976c4a527";

  inputs.flake-compat.url = "github:nix-community/flake-compat";
  inputs.flake-utils.url = "github:numtide/flake-utils";
@@ -30,6 +31,10 @@
          inherit system nixpkgs crane rust-overlay extraTestEnv;
          release = false;
        }).garage-test;
+        lints = (compile {
+          inherit system nixpkgs crane rust-overlay;
+          release = false;
+        });
      in
      {
        packages = {
@@ -53,9 +58,16 @@
          tests-sqlite = testWith {
            GARAGE_TEST_INTEGRATION_DB_ENGINE = "sqlite";
          };
+          tests-fjall = testWith {
+            GARAGE_TEST_INTEGRATION_DB_ENGINE = "fjall";
+          };
+
+          # lints (fmt, clippy)
+          fmt = lints.garage-cargo-fmt;
+          clippy = lints.garage-cargo-clippy;
        };

-        # ---- developpment shell, for making native builds only ----
+        # ---- development shell, for making native builds only ----
        devShells =
          let
            targets = compile {
@@ -78,6 +90,9 @@
                cargo-outdated
                cargo-machete
                nixpkgs-fmt
+                openssl
+                socat
+                killall
              ];
            };
          };
@@ -167,7 +167,7 @@ let
                 </ul></p>
                 <p> Sources:
                 <ul>
-                  <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/${r.type}/${x.version}">gitea</a></li>
+                  <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/${r.type}/${x.version}">Forgejo</a></li>
                  <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${x.version}.zip">.zip</a></li>
                  <li><a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${x.version}.tar.gz">.tar.gz</a></li>
                 </ul></p>
@@ -48,7 +48,7 @@ let

  inherit (pkgs) lib stdenv;

-  toolchainFn = (p: p.rust-bin.stable."1.82.0".default.override {
+  toolchainFn = (p: p.rust-bin.stable."1.91.0".default.override {
    targets = lib.optionals (target != null) [ rustTarget ];
    extensions = [
      "rust-src"
@@ -68,7 +68,7 @@ let
  rootFeatures = if features != null then
    features
  else
-    ([ "bundled-libs" "lmdb" "sqlite" "k2v" ] ++ (lib.optionals release [
+    ([ "bundled-libs" "lmdb" "sqlite" "fjall" "k2v" ] ++ (lib.optionals release [
      "consul-discovery"
      "kubernetes-discovery"
      "metrics"
@@ -190,4 +190,15 @@ in rec {
      pkgs.cacert
    ];
  } // extraTestEnv);
+
+  # ---- source code linting ----
+
+  garage-cargo-fmt = craneLib.cargoFmt (commonArgs // {
+    cargoExtraArgs = "";
+  });
+
+  garage-cargo-clippy = craneLib.cargoClippy (commonArgs // {
+    cargoArtifacts = garage-deps;
+    cargoClippyExtraArgs = "--all-targets -- -D warnings";
+  });
 }
@@ -2,8 +2,8 @@ apiVersion: v2
 name: garage
 description: S3-compatible object store for small self-hosted geo-distributed deployments
 type: application
-version: 0.8.0
-appVersion: "v2.0.0"
+version: 0.9.2
+appVersion: "v2.2.0"
 home: https://garagehq.deuxfleurs.fr/
 icon: https://garagehq.deuxfleurs.fr/images/garage-logo.svg

@@ -1,6 +1,6 @@
 # garage

-![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.0](https://img.shields.io/badge/AppVersion-v2.0.0-informational?style=flat-square)
+![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.0](https://img.shields.io/badge/AppVersion-v2.2.0-informational?style=flat-square)

 S3-compatible object store for small self-hosted geo-distributed deployments

@@ -15,6 +15,7 @@ S3-compatible object store for small self-hosted geo-distributed deployments
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
+| commonLabels  | object | `{}` | Extra labels for all resources |
 | 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 |
@@ -28,7 +29,7 @@ S3-compatible object store for small self-hosted geo-distributed deployments
 | garage.dbEngine | string | `"lmdb"` | Can be changed for better performance on certain systems https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#db_engine |
 | 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.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 resources |
 | garage.replicationFactor | string | `"3"` | Default to 3 replicas, see the replication_factor section at https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication_factor |
 | garage.consistencyMode | string | `"consistent"` | Default to read-after-write consistency, see the consistency_mode section at https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#consistency_mode |
 | garage.metadataAutoSnapshotInterval | string | `""` | If this value is set, Garage will automatically take a snapshot of the metadata DB file at a regular interval and save it in the metadata directory. https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#metadata_auto_snapshot_interval |
@@ -75,7 +76,7 @@ S3-compatible object store for small self-hosted geo-distributed deployments
 | persistence.enabled | bool | `true` |  |
 | persistence.meta.hostPath | string | `"/var/lib/garage/meta"` |  |
 | persistence.meta.size | string | `"100Mi"` |  |
-| podAnnotations | object | `{}` | additonal pod annotations |
+| podAnnotations | object | `{}` | additional pod annotations |
 | podSecurityContext.fsGroup | int | `1000` |  |
 | podSecurityContext.runAsGroup | int | `1000` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
@@ -27,7 +27,7 @@ If release name contains chart name it will be used as a full name.
 Create the name of the rpc secret
 */}}
 {{- define "garage.rpcSecretName" -}}
-{{- printf "%s-rpc-secret" (include "garage.fullname" .) -}}
+{{- .Values.garage.existingRpcSecret | default (printf "%s-rpc-secret" (include "garage.fullname" .)) -}}
 {{- end }}

 {{/*
@@ -47,6 +47,9 @@ helm.sh/chart: {{ include "garage.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- with .Values.commonLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- end }}

 {{/*
@@ -13,7 +13,7 @@ data:

    db_engine = "{{ .Values.garage.dbEngine }}"

-    block_size = {{ .Values.garage.blockSize }}
+    block_size = "{{ .Values.garage.blockSize }}"

    replication_factor = {{ .Values.garage.replicationFactor }}
    consistency_mode = "{{ .Values.garage.consistencyMode }}"
@@ -28,8 +28,16 @@ data:
    # rpc_secret will be populated by the init container from a k8s secret object
    rpc_secret = "__RPC_SECRET_REPLACE__"

-    bootstrap_peers = {{ .Values.garage.bootstrapPeers }}
+    bootstrap_peers = [
+    {{- range $index, $peer := .Values.garage.bootstrapPeers }}
+    {{- if $index}}, {{ end }}{{ $peer | quote }}
+    {{ end }} 
+    ]

+    {{- if .Values.garage.additionalTopLevelConfig }}
+    {{ .Values.garage.additionalTopLevelConfig | nindent 4 }}
+    {{- end }}
+  
    [kubernetes_discovery]
    namespace = "{{ .Release.Namespace }}"
    service_name = "{{ include "garage.fullname" . }}"
@@ -1,3 +1,4 @@
+{{- if not .Values.garage.existingRpcSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -12,3 +13,4 @@ data:
  {{- $prevRpcSecret := $prevSecretData.rpcSecret | default "" | b64dec }}
  {{/* Priority is: 1. from values, 2. previous value, 3. generate random */}}
  rpcSecret: {{ .Values.garage.rpcSecret | default $prevRpcSecret | default (include "jupyterhub.randHex" 64) | b64enc | quote }}
+{{- end }}
@@ -4,6 +4,10 @@ metadata:
  name: {{ include "garage.fullname" . }}
  labels:
    {{- include "garage.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
  type: {{ .Values.service.type }}
  ports:
@@ -37,4 +41,4 @@ spec:
      name: metrics
  selector:
    {{- include "garage.selectorLabels" . | nindent 4 }}
-{{- end }}
+{{- end }}
@@ -21,7 +21,7 @@ spec:
        {{- toYaml . | nindent 8 }}
      {{- end }}
      labels:
-        {{- include "garage.selectorLabels" . | nindent 8 }}
+        {{- include "garage.labels" . | nindent 8 }}
    spec:
      {{- with .Values.imagePullSecrets }}
      imagePullSecrets:
@@ -2,6 +2,11 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

+# -- Additional labels to add to all resources created by this chart
+commonLabels: {}
+#   app.kubernetes.io/part-of: storage
+#   team: platform
+
 # Garage configuration. These values go to garage.toml
 garage:
  # -- Can be changed for better performance on certain systems
@@ -32,10 +37,14 @@ garage:
  rpcBindAddr: "[::]:3901"
  # -- If not given, a random secret will be generated and stored in a Secret object
  rpcSecret: ""
+  # -- If you want to provide an rpcSecret within an existing k8s secret,
+  # specify the secret name here, and store the value under the secret key `rpcSecret`
+  # the default secret will not be created
+  existingRpcSecret: ""
  # -- 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
+  # of the helm chart, for example if you operate at namespace level without cluster resources
  kubernetesSkipCrd: false
  s3:
    api:
@@ -45,6 +54,12 @@ garage:
      rootDomain: ".web.garage.tld"
      index: "index.html"

+  # -- Additional configuration to append to garage.toml. Use a multi-line string for custom config.
+  # Example:
+  #  additionalTopLevelConfig: |-
+  #    data_fsync = true
+  additionalTopLevelConfig: ""
+
  # -- if not empty string, allow using an existing ConfigMap for the garage.toml,
  # if set, ignores garage.toml
  existingConfigMap: ""
@@ -105,13 +120,14 @@ serviceAccount:
  # If not set and create is true, a name is generated using the fullname template
  name: ""

-# -- additonal pod annotations
+# -- additional pod annotations
 podAnnotations: {}

 podSecurityContext:
  runAsUser: 1000
  runAsGroup: 1000
  fsGroup: 1000
+  fsGroupChangePolicy: "OnRootMismatch"
  runAsNonRoot: true

 securityContext:
@@ -128,6 +144,8 @@ service:
  # - NodePort (+ Ingress)
  # - LoadBalancer
  type: ClusterIP
+  # -- Annotations to add to the service
+  annotations: {}
  s3:
    api:
      port: 3900
@@ -191,7 +209,7 @@ ingress:
      #      - kubernetes.docker.internal

 resources: {}
-  # The following are indicative for a small-size deployement, for anything serious double them.
+  # The following are indicative for a small-size deployment, for anything serious double them.
  # limits:
  #   cpu: 100m
  #   memory: 1024Mi
@@ -127,7 +127,7 @@ They are due to the download being interrupted in the middle (^C during first la
 Add `:force?` to the `cached-wget!` call in `daemon.clj` to re-download the binary,
 or restar the VMs to clear temporary files.

-### In `jepsen.garage`: prefix wierdness
+### In `jepsen.garage`: prefix weirdness

 In `store/garage set1/20231019T163358.615+0200`:

@@ -146,12 +146,12 @@ and passing all values that were previously in the context (creds and prefix) as
 The reg2 test is our custom checker for CRDT read-after-write on individual object keys, acting as registers which can be updated.
 The test fails without the timestamp fix, which is expected as the clock scrambler will prevent nodes from having a correct ordering of objects.

-With the timestamp fix (`--patch tsfix1`), the happenned-before relationship should at least be respected, meaning that when a PutObject call starts
+With the timestamp fix (`--patch tsfix1`), the happened-before relationship should at least be respected, meaning that when a PutObject call starts
 after another PutObject call has ended, the second call should overwrite the value of the first call, and that value should not be
 readable by future GetObject calls.
 However, we observed inconsistencies even with the timestamp fix.

-The inconsistencies seemed to always happenned after writing a nil value, which translates to a DeleteObject call
+The inconsistencies seemed to always happened after writing a nil value, which translates to a DeleteObject call
 instead of a PutObject. By removing the possibility of writing nil values, therefore only doing
 PutObject calls, the issue disappears. There is therefore an issue to fix in DeleteObject.

@@ -694,32 +694,7 @@
            ]
          }
        },
-        "overrides": [
-          {
-            "__systemRef": "hideSeriesFrom",
-            "matcher": {
-              "id": "byNames",
-              "options": {
-                "mode": "exclude",
-                "names": [
-                  "10.83.2.3:3903"
-                ],
-                "prefix": "All except:",
-                "readOnly": true
-              }
-            },
-            "properties": [
-              {
-                "id": "custom.hideFrom",
-                "value": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": true
-                }
-              }
-            ]
-          }
-        ]
+        "overrides": []
      },
      "gridPos": {
        "h": 8,
@@ -2,7 +2,7 @@

 : '
 	This script tests whether uploaded parts can be skipped in a
-	CompleteMultipartUpoad
+	CompleteMultipartUpload

 	On Minio: yes, parts can be skipped

@@ -52,7 +52,7 @@

 	Conclusions:

-	- Skipping a part in a CompleteMultipartUpoad call is OK
+	- Skipping a part in a CompleteMultipartUpload call is OK
 	- The part is simply not included in the stored object
 	- Sequential part renumbering counts only non-skipped parts
 '
@@ -26,7 +26,7 @@ in
      s3cmd
      minio-client
      rclone
-      (python312.withPackages (ps: [ ps.boto3 ]))
+      (python313.withPackages (ps: [ ps.boto3 ]))

      socat
      psmisc
@@ -34,8 +34,11 @@ in
      openssl
      curl
      jq
+      typos
    ];
    shellHook = ''
+      export AWS_REQUEST_CHECKSUM_CALCULATION='when_required'
+
      function to_s3 {
        AWS_REQUEST_CHECKSUM_CALCULATION=WHEN_REQUIRED AWS_RESPONSE_CHECKSUM_VALIDATION=WHEN_REQUIRED \
        aws \
@@ -49,7 +52,7 @@ in
      function to_docker {
        executor  \
          --force \
-          --customPlatform="$(echo "''${DOCKER_PLATFORM}" | sed 's/i386/386/')" \
+          --custom-platform="$(echo "''${DOCKER_PLATFORM}" | sed 's/i386/386/')" \
          --destination "$(echo "''${CONTAINER_NAME}" | sed 's/i386/386/'):''${CONTAINER_TAG}" \
          --context dir://`pwd` \
          --verbosity=debug
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_admin"
-version = "2.0.0"
+version = "2.2.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -26,7 +26,7 @@ argon2.workspace = true
 async-trait.workspace = true
 bytesize.workspace = true
 chrono.workspace = true
-err-derive.workspace = true
+thiserror.workspace = true
 hex.workspace = true
 paste.workspace = true
 tracing.workspace = true
@@ -46,5 +46,5 @@ opentelemetry-prometheus = { workspace = true, optional = true }
 prometheus = { workspace = true, optional = true }

 [features]
-metrics = [ "opentelemetry-prometheus", "prometheus" ]
-k2v = [ "garage_model/k2v" ]
+metrics = ["opentelemetry-prometheus", "prometheus"]
+k2v = ["garage_model/k2v"]
@@ -143,7 +143,7 @@ impl RequestHandler for UpdateAdminTokenRequest {
 		garage: &Arc<Garage>,
 		_admin: &Admin,
 	) -> Result<UpdateAdminTokenResponse, Error> {
-		let mut token = get_existing_admin_token(&garage, &self.id).await?;
+		let mut token = get_existing_admin_token(garage, &self.id).await?;

 		apply_token_updates(&mut token, self.body)?;

@@ -164,7 +164,7 @@ impl RequestHandler for DeleteAdminTokenRequest {
 		garage: &Arc<Garage>,
 		_admin: &Admin,
 	) -> Result<DeleteAdminTokenResponse, Error> {
-		let token = get_existing_admin_token(&garage, &self.id).await?;
+		let token = get_existing_admin_token(garage, &self.id).await?;

 		garage
 			.admin_token_table
@@ -175,6 +175,63 @@ impl RequestHandler for DeleteAdminTokenRequest {
 	}
 }

+impl RequestHandler for GetCurrentAdminTokenInfoRequest {
+	type Response = GetCurrentAdminTokenInfoResponse;
+
+	async fn handle(
+		self,
+		garage: &Arc<Garage>,
+		_admin: &Admin,
+	) -> Result<GetCurrentAdminTokenInfoResponse, Error> {
+		let now = now_msec();
+
+		if garage
+			.config
+			.admin
+			.metrics_token
+			.as_ref()
+			.is_some_and(|s| s == &self.admin_token)
+		{
+			return Ok(GetCurrentAdminTokenInfoResponse(
+				GetAdminTokenInfoResponse {
+					id: None,
+					created: None,
+					name: "metrics_token (from daemon configuration)".into(),
+					expiration: None,
+					expired: false,
+					scope: vec!["Metrics".into()],
+				},
+			));
+		}
+
+		if garage
+			.config
+			.admin
+			.admin_token
+			.as_ref()
+			.is_some_and(|s| s == &self.admin_token)
+		{
+			return Ok(GetCurrentAdminTokenInfoResponse(
+				GetAdminTokenInfoResponse {
+					id: None,
+					created: None,
+					name: "admin_token (from daemon configuration)".into(),
+					expiration: None,
+					expired: false,
+					scope: vec!["*".into()],
+				},
+			));
+		}
+
+		let (prefix, _) = self.admin_token.split_once('.').unwrap();
+		let token = get_existing_admin_token(garage, &prefix.to_string()).await?;
+
+		Ok(GetCurrentAdminTokenInfoResponse(admin_token_info_results(
+			&token, now,
+		)))
+	}
+}
+
 // ---- helpers ----

 fn admin_token_info_results(token: &AdminApiToken, now: u64) -> GetAdminTokenInfoResponse {
@@ -12,7 +12,7 @@ use garage_rpc::*;

 use garage_model::garage::Garage;

-use garage_api_common::helpers::is_default;
+use garage_api_common::{common_error::CommonError, helpers::is_default};

 use crate::api_server::{find_matching_nodes, AdminRpc, AdminRpcResponse};
 use crate::error::Error;
@@ -56,6 +56,7 @@ admin_endpoints![
 	CreateAdminToken,
 	UpdateAdminToken,
 	DeleteAdminToken,
+	GetCurrentAdminTokenInfo,

 	// Layout operations
 	GetClusterLayout,
@@ -144,6 +145,13 @@ pub struct MultiResponse<RB> {
 	pub error: HashMap<String, String>,
 }

+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
+pub struct MultiRequestQueryParams {
+	/// Node ID to query, or `*` for all nodes, or `self` for the node responding to the request
+	pub node: String,
+}
+
 // **********************************************
 //      Special endpoints
 //
@@ -154,8 +162,10 @@ pub struct MultiResponse<RB> {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct OptionsRequest;

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct CheckDomainRequest {
+	/// The domain name to check for
 	pub domain: String,
 }

@@ -252,12 +262,12 @@ pub struct GetClusterHealthResponse {
 	pub status: String,
 	/// the number of nodes this Garage node has had a TCP connection to since the daemon started
 	pub known_nodes: usize,
-	/// the nubmer of nodes this Garage node currently has an open connection to
+	/// the number of nodes this Garage node currently has an open connection to
 	pub connected_nodes: usize,
 	/// the number of storage nodes currently registered in the cluster layout
 	pub storage_nodes: usize,
 	/// the number of storage nodes to which a connection is currently open
-	pub storage_nodes_ok: usize,
+	pub storage_nodes_up: usize,
 	/// the total number of partitions of the data (currently always 256)
 	pub partitions: usize,
 	/// the number of partitions for which a quorum of write nodes is available
@@ -308,6 +318,7 @@ pub struct ListAdminTokensResponse(pub Vec<GetAdminTokenInfoResponse>);
 // ---- GetAdminTokenInfo ----

 #[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 #[serde(rename_all = "camelCase")]
 pub struct GetAdminTokenInfoRequest {
 	/// Admin API token ID
@@ -353,9 +364,12 @@ pub struct CreateAdminTokenResponse {

 // ---- UpdateAdminToken ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct UpdateAdminTokenRequest {
+	/// Admin API token ID
 	pub id: String,
+	#[param(ignore = true)]
 	pub body: UpdateAdminTokenRequestBody,
 }

@@ -373,7 +387,7 @@ pub struct UpdateAdminTokenRequestBody {
 	/// `GetClusterStatus`, etc), or the special value `*` to allow all
 	/// admin endpoints. **WARNING:** Granting a scope of `CreateAdminToken` or
 	/// `UpdateAdminToken` trivially allows for privilege escalation, and is thus
-	/// functionnally equivalent to granting a scope of `*`.
+	/// functionally equivalent to granting a scope of `*`.
 	pub scope: Option<Vec<String>>,
 }

@@ -382,14 +396,25 @@ pub struct UpdateAdminTokenResponse(pub GetAdminTokenInfoResponse);

 // ---- DeleteAdminToken ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct DeleteAdminTokenRequest {
+	/// Admin API token ID
 	pub id: String,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DeleteAdminTokenResponse;

+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GetCurrentAdminTokenInfoRequest {
+	pub admin_token: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct GetCurrentAdminTokenInfoResponse(pub GetAdminTokenInfoResponse);
+
 // **********************************************
 //      Layout operations
 // **********************************************
@@ -648,6 +673,7 @@ pub struct ListKeysResponseItem {
 // ---- GetKeyInfo ----

 #[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 #[serde(rename_all = "camelCase")]
 pub struct GetKeyInfoRequest {
 	/// Access key ID
@@ -724,9 +750,12 @@ pub struct ImportKeyResponse(pub GetKeyInfoResponse);

 // ---- UpdateKey ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct UpdateKeyRequest {
+	/// Access key ID
 	pub id: String,
+	#[param(ignore = true)]
 	pub body: UpdateKeyRequestBody,
 }

@@ -751,8 +780,10 @@ pub struct UpdateKeyRequestBody {

 // ---- DeleteKey ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct DeleteKeyRequest {
+	/// Access key ID
 	pub id: String,
 }

@@ -790,6 +821,7 @@ pub struct BucketLocalAlias {
 // ---- GetBucketInfo ----

 #[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 #[serde(rename_all = "camelCase")]
 pub struct GetBucketInfoRequest {
 	/// Exact bucket ID to look up
@@ -809,7 +841,7 @@ pub struct GetBucketInfoResponse {
 	pub created: DateTime<Utc>,
 	/// List of global aliases for this bucket
 	pub global_aliases: Vec<String>,
-	/// Whether website acces is enabled for this bucket
+	/// Whether website access is enabled for this bucket
 	pub website_access: bool,
 	#[serde(default)]
 	/// Website configuration for this bucket
@@ -878,9 +910,12 @@ pub struct CreateBucketLocalAlias {

 // ---- UpdateBucket ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct UpdateBucketRequest {
+	/// ID of the bucket to update
 	pub id: String,
+	#[param(ignore = true)]
 	pub body: UpdateBucketRequestBody,
 }

@@ -904,8 +939,10 @@ pub struct UpdateBucketWebsiteAccess {

 // ---- DeleteBucket ----

-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 pub struct DeleteBucketRequest {
+	/// ID of the bucket to delete
 	pub id: String,
 }

@@ -928,6 +965,7 @@ pub struct CleanupIncompleteUploadsResponse {
 }

 #[derive(Debug, Clone, Serialize, Deserialize, IntoParams)]
+#[into_params(parameter_in = Query)]
 #[serde(rename_all = "camelCase")]
 pub struct InspectObjectRequest {
 	pub bucket_id: String,
@@ -1115,6 +1153,7 @@ pub enum RepairType {
 	Rebalance,
 	Scrub(ScrubCommand),
 	Aliases,
+	ClearResyncQueue,
 }

 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
@@ -64,7 +64,7 @@ impl EndpointHandler<AdminRpc> for AdminApiServer {
 		match message {
 			AdminRpc::Proxy(req) => {
 				info!("Proxied admin API request: {}", req.name());
-				let res = req.clone().handle(&self.garage, &self).await;
+				let res = req.clone().handle(&self.garage, self).await;
 				match res {
 					Ok(res) => Ok(AdminRpcResponse::ProxyApiOkResponse(res.tagged())),
 					Err(e) => Ok(AdminRpcResponse::ApiErrorResponse {
@@ -76,7 +76,7 @@ impl EndpointHandler<AdminRpc> for AdminApiServer {
 			}
 			AdminRpc::Internal(req) => {
 				info!("Internal admin API request: {}", req.name());
-				let res = req.clone().handle(&self.garage, &self).await;
+				let res = req.clone().handle(&self.garage, self).await;
 				match res {
 					Ok(res) => Ok(AdminRpcResponse::InternalApiOkResponse(res)),
 					Err(e) => Ok(AdminRpcResponse::ApiErrorResponse {
@@ -173,12 +173,12 @@ impl AdminApiServer {
 		}

 		match request {
-			AdminApiRequest::Options(req) => req.handle(&self.garage, &self).await,
-			AdminApiRequest::CheckDomain(req) => req.handle(&self.garage, &self).await,
-			AdminApiRequest::Health(req) => req.handle(&self.garage, &self).await,
-			AdminApiRequest::Metrics(req) => req.handle(&self.garage, &self).await,
+			AdminApiRequest::Options(req) => req.handle(&self.garage, self).await,
+			AdminApiRequest::CheckDomain(req) => req.handle(&self.garage, self).await,
+			AdminApiRequest::Health(req) => req.handle(&self.garage, self).await,
+			AdminApiRequest::Metrics(req) => req.handle(&self.garage, self).await,
 			req => {
-				let res = req.handle(&self.garage, &self).await?;
+				let res = req.handle(&self.garage, self).await?;
 				let mut res = json_ok_response(&res)?;
 				res.headers_mut()
 					.insert(ACCESS_CONTROL_ALLOW_ORIGIN, HeaderValue::from_static("*"));
@@ -217,6 +217,13 @@ impl ApiHandler for ArcAdminApiServer {
 	) -> Result<Response<ResBody>, Error> {
 		self.0.handle_http_api(req, endpoint).await
 	}
+
+	fn key_id_from_request(&self, req: &Request<IncomingBody>) -> Option<String> {
+		let auth_header = req.headers().get(AUTHORIZATION)?;
+		let token = parse_authorization(auth_header).ok()?;
+		let key_id = token.split_once('.')?.0;
+		Some(key_id.to_string())
+	}
 }

 impl ApiEndpoint for HttpEndpoint {
@@ -244,6 +251,15 @@ fn hash_bearer_token(token: &str) -> String {
 		.to_string()
 }

+fn parse_authorization(auth_header: &hyper::http::HeaderValue) -> Result<&str, Error> {
+	let token = auth_header
+		.to_str()?
+		.strip_prefix("Bearer ")
+		.ok_or_else(|| Error::forbidden("Invalid Authorization header"))?
+		.trim();
+	Ok(token)
+}
+
 fn verify_authorization(
 	garage: &Garage,
 	global_token_hash: Option<&str>,
@@ -260,11 +276,7 @@ fn verify_authorization(
 				"Bearer token must be provided in Authorization header",
 			))
 		}
-		Some(authorization) => authorization
-			.to_str()?
-			.strip_prefix("Bearer ")
-			.ok_or_else(|| Error::forbidden("Invalid Authorization header"))?
-			.trim(),
+		Some(authorization) => parse_authorization(authorization)?,
 	};

 	let token_hash_string = if let Some((prefix, _)) = token.split_once('.') {
@@ -273,7 +285,8 @@ fn verify_authorization(
 			.get_local(&EmptyKey, &prefix.to_string())?
 			.and_then(|k| k.state.into_option())
 			.filter(|p| !p.is_expired(now_msec()))
-			.filter(|p| p.has_scope(endpoint_name))
+			// GetCurrentAdminTokenInfo endpoint must be accessible even if it is not in the token scopes
+			.filter(|p| p.has_scope(endpoint_name) || endpoint_name == "GetCurrentAdminTokenInfo")
 			.ok_or_else(|| Error::forbidden(invalid_msg))?
 			.token_hash
 	} else {
@@ -293,38 +306,36 @@ fn verify_authorization(
 }

 pub(crate) fn find_matching_nodes(garage: &Garage, spec: &str) -> Result<Vec<Uuid>, Error> {
-	let mut res = vec![];
-	if spec == "*" {
-		res = garage.system.cluster_layout().all_nodes().to_vec();
+	if spec == "self" {
+		Ok(vec![garage.system.id])
+	} else {
+		// Collect all nodes currently up and/or in cluster layout
+		let mut res = vec![];
+		if let Ok(all_nodes) = garage.system.cluster_layout().all_nodes() {
+			res = all_nodes.to_vec();
+		}
 		for node in garage.system.get_known_nodes() {
 			if node.is_up && !res.contains(&node.id) {
 				res.push(node.id);
 			}
 		}
-	} else if spec == "self" {
-		res.push(garage.system.id);
-	} else {
-		let layout = garage.system.cluster_layout();
-		let known_nodes = garage.system.get_known_nodes();
-		let all_nodes = layout
-			.all_nodes()
-			.iter()
-			.copied()
-			.chain(known_nodes.iter().filter(|x| x.is_up).map(|x| x.id));
-		for node in all_nodes {
-			if !res.contains(&node) && hex::encode(node).starts_with(spec) {
-				res.push(node);
+
+		if spec == "*" {
+			// match all nodes
+			Ok(res)
+		} else {
+			// filter nodes that match spec
+			res.retain(|node| hex::encode(node).starts_with(spec));
+			if res.is_empty() {
+				Err(Error::bad_request(format!("No nodes matching {}", spec)))
+			} else if res.len() > 1 {
+				Err(Error::bad_request(format!(
+					"Multiple nodes matching {}: {:?}",
+					spec, res
+				)))
+			} else {
+				Ok(res)
 			}
 		}
-		if res.is_empty() {
-			return Err(Error::bad_request(format!("No nodes matching {}", spec)));
-		}
-		if res.len() > 1 {
-			return Err(Error::bad_request(format!(
-				"Multiple nodes matching {}: {:?}",
-				spec, res
-			)));
-		}
 	}
-	Ok(res)
 }
@@ -29,7 +29,7 @@ impl RequestHandler for LocalListBlockErrorsRequest {
 		let errors = errors
 			.into_iter()
 			.map(|e| BlockError {
-				block_hash: hex::encode(&e.hash),
+				block_hash: hex::encode(e.hash),
 				refcount: e.refcount,
 				error_count: e.error_count,
 				last_try_secs_ago: now.saturating_sub(e.last_try) / 1000,
@@ -61,15 +61,15 @@ impl RequestHandler for LocalGetBlockInfoRequest {
 					VersionBacklink::MultipartUpload { upload_id } => {
 						if let Some(u) = garage.mpu_table.get(upload_id, &EmptyKey).await? {
 							BlockVersionBacklink::Upload {
-								upload_id: hex::encode(&upload_id),
+								upload_id: hex::encode(upload_id),
 								upload_deleted: u.deleted.get(),
 								upload_garbage_collected: false,
-								bucket_id: Some(hex::encode(&u.bucket_id)),
+								bucket_id: Some(hex::encode(u.bucket_id)),
 								key: Some(u.key.to_string()),
 							}
 						} else {
 							BlockVersionBacklink::Upload {
-								upload_id: hex::encode(&upload_id),
+								upload_id: hex::encode(upload_id),
 								upload_deleted: true,
 								upload_garbage_collected: true,
 								bucket_id: None,
@@ -78,12 +78,12 @@ impl RequestHandler for LocalGetBlockInfoRequest {
 						}
 					}
 					VersionBacklink::Object { bucket_id, key } => BlockVersionBacklink::Object {
-						bucket_id: hex::encode(&bucket_id),
+						bucket_id: hex::encode(bucket_id),
 						key: key.to_string(),
 					},
 				};
 				versions.push(BlockVersion {
-					version_id: hex::encode(&br.version),
+					version_id: hex::encode(br.version),
 					ref_deleted: br.deleted.get(),
 					version_deleted: v.deleted.get(),
 					garbage_collected: false,
@@ -91,7 +91,7 @@ impl RequestHandler for LocalGetBlockInfoRequest {
 				});
 			} else {
 				versions.push(BlockVersion {
-					version_id: hex::encode(&br.version),
+					version_id: hex::encode(br.version),
 					ref_deleted: br.deleted.get(),
 					version_deleted: true,
 					garbage_collected: true,
@@ -100,7 +100,7 @@ impl RequestHandler for LocalGetBlockInfoRequest {
 			}
 		}
 		Ok(LocalGetBlockInfoResponse {
-			block_hash: hex::encode(&hash),
+			block_hash: hex::encode(hash),
 			refcount,
 			versions,
 		})
@@ -215,7 +215,7 @@ fn find_block_hash_by_prefix(garage: &Arc<Garage>, prefix: &str) -> Result<Hash,
 	for item in iter {
 		let (k, _v) = item.map_err(GarageError::from)?;
 		let hash = Hash::try_from(&k[..32]).unwrap();
-		if &hash.as_slice()[..prefix_bin.len()] != prefix_bin {
+		if hash.as_slice()[..prefix_bin.len()] != prefix_bin {
 			break;
 		}
 		if hex::encode(hash.as_slice()).starts_with(prefix) {
@@ -183,7 +183,7 @@ impl RequestHandler for CreateBucketRequest {

 			let key = helper.key().get_existing_key(&la.access_key_id).await?;
 			let state = key.state.as_option().unwrap();
-			if matches!(state.local_aliases.get(&la.alias), Some(_)) {
+			if state.local_aliases.get(&la.alias).is_some() {
 				return Err(Error::bad_request("Local alias already exists"));
 			}
 		}
@@ -380,13 +380,13 @@ impl RequestHandler for InspectObjectRequest {
 						.map(|(vk, vb)| InspectObjectBlock {
 							part_number: vk.part_number,
 							offset: vk.offset,
-							hash: hex::encode(&vb.hash),
+							hash: hex::encode(vb.hash),
 							size: vb.size,
 						})
 						.collect::<Vec<_>>()
 				})
 				.unwrap_or_default();
-			let uuid = hex::encode(&obj_ver.uuid);
+			let uuid = hex::encode(obj_ver.uuid);
 			let timestamp = DateTime::from_timestamp_millis(obj_ver.timestamp as i64)
 				.expect("invalid timestamp in db");
 			match &obj_ver.state {
@@ -467,7 +467,7 @@ impl RequestHandler for InspectObjectRequest {
 		}

 		Ok(InspectObjectResponse {
-			bucket_id: hex::encode(&object.bucket_id),
+			bucket_id: hex::encode(object.bucket_id),
 			key: object.key,
 			versions,
 		})
@@ -697,20 +697,21 @@ async fn bucket_info_results(
 		}),
 		keys: relevant_keys
 			.into_values()
-			.map(|key| {
+			.filter_map(|key| {
 				let p = key.state.as_option().unwrap();
-				GetBucketInfoKey {
+				let permissions = p
+					.authorized_buckets
+					.get(&bucket.id)
+					.filter(|p| p.is_any())
+					.map(|p| ApiBucketKeyPerm {
+						read: p.allow_read,
+						write: p.allow_write,
+						owner: p.allow_owner,
+					})?;
+				Some(GetBucketInfoKey {
 					access_key_id: key.key_id,
 					name: p.name.get().to_string(),
-					permissions: p
-						.authorized_buckets
-						.get(&bucket.id)
-						.map(|p| ApiBucketKeyPerm {
-							read: p.allow_read,
-							write: p.allow_write,
-							owner: p.allow_owner,
-						})
-						.unwrap_or_default(),
+					permissions,
 					bucket_local_aliases: p
 						.local_aliases
 						.items()
@@ -718,7 +719,7 @@ async fn bucket_info_results(
 						.filter(|(_, _, b)| *b == Some(bucket.id))
 						.map(|(n, _, _)| n.to_string())
 						.collect::<Vec<_>>(),
-				}
+				})
 			})
 			.collect::<Vec<_>>(),
 		objects: *counters.get(OBJECTS).unwrap_or(&0),
@@ -56,48 +56,52 @@ impl RequestHandler for GetClusterStatusRequest {
 			})
 			.collect::<HashMap<_, _>>();

-		for (id, _, role) in layout.current().roles.items().iter() {
-			if let layout::NodeRoleV(Some(r)) = role {
-				let role = NodeAssignedRole {
-					zone: r.zone.to_string(),
-					capacity: r.capacity,
-					tags: r.tags.clone(),
-				};
-				match nodes.get_mut(id) {
-					None => {
-						nodes.insert(
-							*id,
-							NodeResp {
-								id: hex::encode(id),
-								role: Some(role),
-								..Default::default()
-							},
-						);
-					}
-					Some(n) => {
-						n.role = Some(role);
+		if let Ok(current_layout) = layout.current() {
+			for (id, _, role) in current_layout.roles.items().iter() {
+				if let layout::NodeRoleV(Some(r)) = role {
+					let role = NodeAssignedRole {
+						zone: r.zone.to_string(),
+						capacity: r.capacity,
+						tags: r.tags.clone(),
+					};
+					match nodes.get_mut(id) {
+						None => {
+							nodes.insert(
+								*id,
+								NodeResp {
+									id: hex::encode(id),
+									role: Some(role),
+									..Default::default()
+								},
+							);
+						}
+						Some(n) => {
+							n.role = Some(role);
+						}
 					}
 				}
 			}
 		}

-		for ver in layout.versions().iter().rev().skip(1) {
-			for (id, _, role) in ver.roles.items().iter() {
-				if let layout::NodeRoleV(Some(r)) = role {
-					if r.capacity.is_some() {
-						if let Some(n) = nodes.get_mut(id) {
-							if n.role.is_none() {
-								n.draining = true;
+		if let Ok(layout_versions) = layout.versions() {
+			for ver in layout_versions.iter().rev().skip(1) {
+				for (id, _, role) in ver.roles.items().iter() {
+					if let layout::NodeRoleV(Some(r)) = role {
+						if r.capacity.is_some() {
+							if let Some(n) = nodes.get_mut(id) {
+								if n.role.is_none() {
+									n.draining = true;
+								}
+							} else {
+								nodes.insert(
+									*id,
+									NodeResp {
+										id: hex::encode(id),
+										draining: true,
+										..Default::default()
+									},
+								);
 							}
-						} else {
-							nodes.insert(
-								*id,
-								NodeResp {
-									id: hex::encode(id),
-									draining: true,
-									..Default::default()
-								},
-							);
 						}
 					}
 				}
@@ -108,7 +112,7 @@ impl RequestHandler for GetClusterStatusRequest {
 		nodes.sort_by(|x, y| x.id.cmp(&y.id));

 		Ok(GetClusterStatusResponse {
-			layout_version: layout.current().version,
+			layout_version: layout.inner().current().version,
 			nodes,
 		})
 	}
@@ -134,7 +138,9 @@ impl RequestHandler for GetClusterHealthRequest {
 			known_nodes: health.known_nodes,
 			connected_nodes: health.connected_nodes,
 			storage_nodes: health.storage_nodes,
-			storage_nodes_ok: health.storage_nodes_ok,
+			// Translating storage_nodes_up (admin API context) to storage_nodes_ok (metrics context)
+			// TODO: when releasing major release, consider renaming all the fields in the metrics to storage_nodes_up
+			storage_nodes_up: health.storage_nodes_ok,
 			partitions: health.partitions,
 			partitions_quorum: health.partitions_quorum,
 			partitions_all_ok: health.partitions_all_ok,
@@ -157,9 +163,11 @@ impl RequestHandler for GetClusterStatisticsRequest {
 		// Gather storage node and free space statistics for current nodes
 		let layout = &garage.system.cluster_layout();
 		let mut node_partition_count = HashMap::<Uuid, u64>::new();
-		for short_id in layout.current().ring_assignment_data.iter() {
-			let id = layout.current().node_id_vec[*short_id as usize];
-			*node_partition_count.entry(id).or_default() += 1;
+		if let Ok(current_layout) = layout.current() {
+			for short_id in current_layout.ring_assignment_data.iter() {
+				let id = current_layout.node_id_vec[*short_id as usize];
+				*node_partition_count.entry(id).or_default() += 1;
+			}
 		}
 		let node_info = garage
 			.system
@@ -172,7 +180,11 @@ impl RequestHandler for GetClusterStatisticsRequest {
 		for (id, parts) in node_partition_count.iter() {
 			let info = node_info.get(id);
 			let status = info.map(|x| &x.status);
-			let role = layout.current().roles.get(id).and_then(|x| x.0.as_ref());
+			let role = layout
+				.current()
+				.ok()
+				.and_then(|l| l.roles.get(id))
+				.and_then(|x| x.0.as_ref());
 			let hostname = status.and_then(|x| x.hostname.as_deref()).unwrap_or("?");
 			let zone = role.map(|x| x.zone.as_str()).unwrap_or("?");
 			let capacity = role
@@ -1,8 +1,8 @@
 use std::convert::TryFrom;

-use err_derive::Error;
 use hyper::header::HeaderValue;
 use hyper::{HeaderMap, StatusCode};
+use thiserror::Error;

 pub use garage_model::helper::error::Error as HelperError;

@@ -16,36 +16,33 @@ use garage_api_common::helpers::*;
 /// Errors of this crate
 #[derive(Debug, Error)]
 pub enum Error {
-	#[error(display = "{}", _0)]
+	#[error("{0}")]
 	/// Error from common error
-	Common(#[error(source)] CommonError),
+	Common(#[from] CommonError),

 	// Category: cannot process
 	/// The admin API token does not exist
-	#[error(display = "Admin token not found: {}", _0)]
+	#[error("Admin token not found: {0}")]
 	NoSuchAdminToken(String),

 	/// The API access key does not exist
-	#[error(display = "Access key not found: {}", _0)]
+	#[error("Access key not found: {0}")]
 	NoSuchAccessKey(String),

 	/// The requested block does not exist
-	#[error(display = "Block not found: {}", _0)]
+	#[error("Block not found: {0}")]
 	NoSuchBlock(String),

 	/// The requested worker does not exist
-	#[error(display = "Worker not found: {}", _0)]
+	#[error("Worker not found: {0}")]
 	NoSuchWorker(u64),

 	/// The object requested don't exists
-	#[error(display = "Key not found")]
+	#[error("Key not found")]
 	NoSuchKey,

 	/// In Import key, the key already exists
-	#[error(
-		display = "Key {} already exists in data store. Even if it is deleted, we can't let you create a new key with the same ID. Sorry.",
-		_0
-	)]
+	#[error("Key {0} already exists in data store. Even if it is deleted, we can't let you create a new key with the same ID. Sorry.")]
 	KeyAlreadyExists(String),
 }

@@ -95,6 +92,7 @@ impl ApiError for Error {
 	fn add_http_headers(&self, header_map: &mut HeaderMap<HeaderValue>) {
 		use hyper::header;
 		header_map.append(header::CONTENT_TYPE, "application/json".parse().unwrap());
+		header_map.append(header::ACCESS_CONTROL_ALLOW_ORIGIN, "*".parse().unwrap());
 	}

 	fn http_body(&self, garage_region: &str, path: &str) -> ErrorBody {
@@ -91,7 +91,7 @@ impl RequestHandler for GetKeyInfoRequest {
 			}
 		};

-		Ok(key_info_results(garage, key, self.show_secret_key).await?)
+		key_info_results(garage, key, self.show_secret_key).await
 	}
 }

@@ -230,9 +230,18 @@ async fn key_info_results(
 		},
 		buckets: relevant_buckets
 			.into_values()
-			.map(|bucket| {
+			.filter_map(|bucket| {
 				let state = bucket.state.as_option().unwrap();
-				KeyInfoBucketResponse {
+				let permissions = key_state
+					.authorized_buckets
+					.get(&bucket.id)
+					.filter(|p| p.is_any())
+					.map(|p| ApiBucketKeyPerm {
+						read: p.allow_read,
+						write: p.allow_write,
+						owner: p.allow_owner,
+					})?;
+				Some(KeyInfoBucketResponse {
 					id: hex::encode(bucket.id),
 					global_aliases: state
 						.aliases
@@ -248,16 +257,8 @@ async fn key_info_results(
 						.filter(|((k, _), _, a)| *a && *k == key.key_id)
 						.map(|((_, n), _, _)| n.to_string())
 						.collect::<Vec<_>>(),
-					permissions: key_state
-						.authorized_buckets
-						.get(&bucket.id)
-						.map(|p| ApiBucketKeyPerm {
-							read: p.allow_read,
-							write: p.allow_write,
-							owner: p.allow_owner,
-						})
-						.unwrap_or_default(),
-				}
+					permissions,
+				})
 			})
 			.collect::<Vec<_>>(),
 	};
@@ -143,7 +143,7 @@ impl RequestHandler for GetClusterLayoutHistoryRequest {
 					.iter()
 					.map(|node| {
 						(
-							hex::encode(&node),
+							hex::encode(node),
 							NodeUpdateTrackers {
 								ack: layout.update_trackers.ack_map.get(node, min_stored),
 								sync: layout.update_trackers.sync_map.get(node, min_stored),
@@ -343,14 +343,16 @@ impl RequestHandler for ClusterLayoutSkipDeadNodesRequest {
 		for node in all_nodes.iter() {
 			// Update ACK tracker for dead nodes or for all nodes if --allow-missing-data
 			if self.allow_missing_data || !status.iter().any(|x| x.id == *node && x.is_up) {
-				if layout.update_trackers.ack_map.set_max(*node, self.version) {
+				let ack_changed = layout.update_trackers.ack_map.set_max(*node, self.version);
+				if ack_changed {
 					ack_updated.push(hex::encode(node));
 				}
 			}

 			// If --allow-missing-data, update SYNC tracker for all nodes.
 			if self.allow_missing_data {
-				if layout.update_trackers.sync_map.set_max(*node, self.version) {
+				let sync_changed = layout.update_trackers.sync_map.set_max(*node, self.version);
+				if sync_changed {
 					sync_updated.push(hex::encode(node));
 				}
 			}
@@ -380,9 +382,9 @@ impl From<layout::ZoneRedundancy> for ZoneRedundancy {
 	}
 }

-impl Into<layout::ZoneRedundancy> for ZoneRedundancy {
-	fn into(self) -> layout::ZoneRedundancy {
-		match self {
+impl From<ZoneRedundancy> for layout::ZoneRedundancy {
+	fn from(val: ZoneRedundancy) -> Self {
+		match val {
 			ZoneRedundancy::Maximum => layout::ZoneRedundancy::Maximum,
 			ZoneRedundancy::AtLeast(x) => layout::ZoneRedundancy::AtLeast(x),
 		}
@@ -397,10 +399,10 @@ impl From<layout::LayoutParameters> for LayoutParameters {
 	}
 }

-impl Into<layout::LayoutParameters> for LayoutParameters {
-	fn into(self) -> layout::LayoutParameters {
+impl From<LayoutParameters> for layout::LayoutParameters {
+	fn from(val: LayoutParameters) -> Self {
 		layout::LayoutParameters {
-			zone_redundancy: self.zone_redundancy.into(),
+			zone_redundancy: val.zone_redundancy.into(),
 		}
 	}
 }
@@ -74,16 +74,18 @@ macro_rules! admin_endpoints {
                type Response = AdminApiResponse;

                async fn handle(self, garage: &Arc<Garage>, admin: &Admin) -> Result<AdminApiResponse, Error> {
-                    Ok(match self {
+                    match self {
                        $(
-                            AdminApiRequest::$special_endpoint(_) => panic!(
-                                concat!(stringify!($special_endpoint), " needs to go through a special handler")
+                            AdminApiRequest::$special_endpoint(_) => Err(
+                                Error::Common(CommonError::BadRequest(
+                                    concat!(stringify!($special_endpoint), " cannot be used outside of the HTTP Admin API").into()
+                                ))
                            ),
                        )*
                        $(
-                            AdminApiRequest::$endpoint(req) => AdminApiResponse::$endpoint(req.handle(garage, admin).await?),
+                            AdminApiRequest::$endpoint(req) => Ok(AdminApiResponse::$endpoint(req.handle(garage, admin).await?)),
                        )*
-                    })
+                    }
                }
            }
        }
@@ -106,17 +106,17 @@ impl RequestHandler for LocalGetNodeStatisticsRequest {

 		// Gather block manager statistics
 		writeln!(&mut ret, "\nBlock manager stats:").unwrap();
-		let rc_len = garage.block_manager.rc_len()?.to_string();
+		let rc_len = garage.block_manager.rc_approximate_len()?.to_string();

 		ret += &format_table_to_string(vec![
 			format!("  number of RC entries:\t{} (~= number of blocks)", rc_len),
 			format!(
 				"  resync queue length:\t{}",
-				garage.block_manager.resync.queue_len()?
+				garage.block_manager.resync.queue_approximate_len()?
 			),
 			format!(
 				"  blocks with resync errors:\t{}",
-				garage.block_manager.resync.errors_len()?
+				garage.block_manager.resync.errors_approximate_len()?
 			),
 		]);

@@ -129,16 +129,21 @@ where
 	F: TableSchema + 'static,
 	R: TableReplication + 'static,
 {
-	let data_len = t.data.store.len().map_err(GarageError::from)?.to_string();
-	let mkl_len = t.merkle_updater.merkle_tree_len()?.to_string();
+	let data_len = t
+		.data
+		.store
+		.approximate_len()
+		.map_err(GarageError::from)?
+		.to_string();
+	let mkl_len = t.merkle_updater.merkle_tree_approximate_len()?.to_string();

 	Ok(format!(
 		"  {}\t{}\t{}\t{}\t{}\t{}",
 		F::TABLE_NAME,
 		data_len,
 		mkl_len,
-		t.merkle_updater.todo_len()?,
-		t.data.insert_queue_len()?,
-		t.data.gc_todo_len()?
+		t.merkle_updater.todo_approximate_len()?,
+		t.data.insert_queue_approximate_len()?,
+		t.data.gc_todo_approximate_len()?
 	))
 }
@@ -1,7 +1,8 @@
 #![allow(dead_code)]
 #![allow(non_snake_case)]

-use utoipa::{Modify, OpenApi};
+use serde::{Deserialize, Serialize};
+use utoipa::{Modify, OpenApi, ToSchema};

 use crate::api::*;

@@ -18,7 +19,7 @@ use crate::api::*;
            (status = 200, description = "Garage daemon metrics exported in Prometheus format"),
        ),
 )]
-fn Metrics() -> () {}
+fn Metrics() {}

 #[utoipa::path(get,
    path = "/health",
@@ -35,7 +36,7 @@ as long as it is able to have a quorum of nodes for read and write operations.
            (status = 503, description = "This Garage daemon is not able to handle requests")
        ),
 )]
-fn Health() -> () {}
+fn Health() {}

 #[utoipa::path(get,
    path = "/check",
@@ -46,16 +47,14 @@ a static website for the requested domain. This is used by reverse proxies such
 as Caddy or Tricot, to avoid requesting TLS certificates for domain names that
 do not correspond to an actual website.
    ",
-    params(
-        ("domain", description = "The domain name to check for"),
-    ),
+    params(CheckDomainRequest),
    security(()),
 	responses(
            (status = 200, description = "The domain name redirects to a static website bucket"),
            (status = 400, description = "No static website bucket exists for this domain")
        ),
 )]
-fn CheckDomain() -> () {}
+fn CheckDomain() {}

 // **********************************************
 //      Cluster operations
@@ -79,7 +78,7 @@ Returns the cluster's current status, including:
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetClusterStatus() -> () {}
+fn GetClusterStatus() {}

 #[utoipa::path(get,
    path = "/v2/GetClusterHealth",
@@ -89,7 +88,7 @@ fn GetClusterStatus() -> () {}
            (status = 200, description = "Cluster health report", body = GetClusterHealthResponse),
        ),
 )]
-fn GetClusterHealth() -> () {}
+fn GetClusterHealth() {}

 #[utoipa::path(get,
    path = "/v2/GetClusterStatistics",
@@ -104,7 +103,7 @@ Fetch global cluster statistics.
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetClusterStatistics() -> () {}
+fn GetClusterStatistics() {}

 #[utoipa::path(post,
    path = "/v2/ConnectClusterNodes",
@@ -116,7 +115,7 @@ fn GetClusterStatistics() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ConnectClusterNodes() -> () {}
+fn ConnectClusterNodes() {}

 // **********************************************
 //      Admin API token operations
@@ -131,7 +130,7 @@ fn ConnectClusterNodes() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ListAdminTokens() -> () {}
+fn ListAdminTokens() {}

 #[utoipa::path(get,
    path = "/v2/GetAdminTokenInfo",
@@ -146,7 +145,7 @@ You can search by specifying the exact token identifier (`id`) or by specifying
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetAdminTokenInfo() -> () {}
+fn GetAdminTokenInfo() {}

 #[utoipa::path(post,
    path = "/v2/CreateAdminToken",
@@ -158,7 +157,7 @@ fn GetAdminTokenInfo() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn CreateAdminToken() -> () {}
+fn CreateAdminToken() {}

 #[utoipa::path(post,
    path = "/v2/UpdateAdminToken",
@@ -167,29 +166,38 @@ fn CreateAdminToken() -> () {}
 Updates information about the specified admin API token.
    ",
    request_body = UpdateAdminTokenRequestBody,
-    params(
-        ("id", description = "Admin API token ID"),
-    ),
+    params(UpdateAdminTokenRequest),
 	responses(
            (status = 200, description = "Admin token has been updated", body = UpdateAdminTokenResponse),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn UpdateAdminToken() -> () {}
+fn UpdateAdminToken() {}

 #[utoipa::path(post,
    path = "/v2/DeleteAdminToken",
    tag = "Admin API token",
    description = "Delete an admin API token from the cluster, revoking all its permissions.",
-    params(
-        ("id", description = "Admin API token ID"),
-    ),
+    params(DeleteAdminTokenRequest),
 	responses(
            (status = 200, description = "Admin token has been deleted"),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn DeleteAdminToken() -> () {}
+fn DeleteAdminToken() {}
+
+#[utoipa::path(get,
+    path = "/v2/GetCurrentAdminTokenInfo",
+    tag = "Admin API token",
+    description = "
+Return information about the calling admin API token.
+    ",
+    responses(
+            (status = 200, description = "Information about the admin token", body = GetCurrentAdminTokenInfoResponse),
+            (status = 500, description = "Internal server error")
+    ),
+)]
+fn GetCurrentAdminTokenInfo() {}

 // **********************************************
 //      Layout operations
@@ -211,7 +219,7 @@ Returns the cluster's current layout, including:
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetClusterLayout() -> () {}
+fn GetClusterLayout() {}

 #[utoipa::path(get,
    path = "/v2/GetClusterLayoutHistory",
@@ -224,7 +232,7 @@ Returns the history of layouts in the cluster
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetClusterLayoutHistory() -> () {}
+fn GetClusterLayoutHistory() {}

 #[utoipa::path(post,
    path = "/v2/UpdateClusterLayout",
@@ -239,7 +247,7 @@ For example to declare 100GB, you must set `capacity: 100000000000`.
 Garage uses internally the International System of Units (SI), it assumes that 1kB = 1000 bytes, and displays storage as kB, MB, GB (and not KiB, MiB, GiB that assume 1KiB = 1024 bytes).
    ",
    request_body(
-        content=UpdateClusterLayoutRequest,
+        content=UpdateClusterLayoutRequestOpenapi,
        description="
 To add a new node to the layout or to change the configuration of an existing node, simply set the values you want (`zone`, `capacity`, and `tags`).
 To remove a node, simply pass the `remove: true` field.
@@ -253,7 +261,46 @@ Contrary to the CLI that may update only a subset of the fields capacity, zone a
            (status = 500, description = "Internal server error")
        ),
 )]
-fn UpdateClusterLayout() -> () {}
+fn UpdateClusterLayout() {}
+
+// Hack: we cannot use the UpdateClusterLayoutRequest from api.rs,
+// as it contains (via NodeRoleChange) an untagged enum flattenned into
+// a struct, which breaks the openapi generator.
+// See issue #1249.
+// Instead, we use a rewritten version of the NodeRoleChange struct where
+// the struct fields are distributed into the enum variants (this is an equivalent
+// representation, but this way we avoid having to rewrite all uses of the original
+// struct in the Garage codebase).
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[schema(as = UpdateClusterLayoutRequest)]
+pub struct UpdateClusterLayoutRequestOpenapi {
+	/// New node roles to assign or remove in the cluster layout
+	#[serde(default)]
+	pub roles: Vec<NodeRoleChangeOpenapi>,
+	/// New layout computation parameters to use
+	#[serde(default)]
+	pub parameters: Option<LayoutParameters>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[schema(as = NodeRoleChangeRequest)]
+#[serde(untagged)]
+pub enum NodeRoleChangeOpenapi {
+	#[serde(rename_all = "camelCase")]
+	Remove {
+		/// ID of the node for which this change applies
+		id: String,
+		/// Set `remove` to `true` to remove the node from the layout
+		remove: bool,
+	},
+	#[serde(rename_all = "camelCase")]
+	Update {
+		/// ID of the node for which this change applies
+		id: String,
+		#[serde(flatten)]
+		role: NodeAssignedRole,
+	},
+}

 #[utoipa::path(post,
    path = "/v2/PreviewClusterLayoutChanges",
@@ -268,7 +315,7 @@ Computes a new layout taking into account the staged parameters, and returns it
            (status = 500, description = "Internal server error")
        ),
 )]
-fn PreviewClusterLayoutChanges() -> () {}
+fn PreviewClusterLayoutChanges() {}

 #[utoipa::path(post,
    path = "/v2/ApplyClusterLayout",
@@ -284,7 +331,7 @@ Applies to the cluster the layout changes currently registered as staged layout
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ApplyClusterLayout() -> () {}
+fn ApplyClusterLayout() {}

 #[utoipa::path(post,
    path = "/v2/RevertClusterLayout",
@@ -295,7 +342,7 @@ fn ApplyClusterLayout() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn RevertClusterLayout() -> () {}
+fn RevertClusterLayout() {}

 #[utoipa::path(post,
    path = "/v2/ClusterLayoutSkipDeadNodes",
@@ -307,7 +354,7 @@ fn RevertClusterLayout() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ClusterLayoutSkipDeadNodes() -> () {}
+fn ClusterLayoutSkipDeadNodes() {}

 // **********************************************
 //      Access key operations
@@ -322,7 +369,7 @@ fn ClusterLayoutSkipDeadNodes() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ListKeys() -> () {}
+fn ListKeys() {}

 #[utoipa::path(get,
    path = "/v2/GetKeyInfo",
@@ -339,7 +386,7 @@ For confidentiality reasons, the secret key is not returned by default: you must
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetKeyInfo() -> () {}
+fn GetKeyInfo() {}

 #[utoipa::path(post,
    path = "/v2/CreateKey",
@@ -351,7 +398,7 @@ fn GetKeyInfo() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn CreateKey() -> () {}
+fn CreateKey() {}

 #[utoipa::path(post,
    path = "/v2/ImportKey",
@@ -367,7 +414,7 @@ Imports an existing API key. This feature must only be used for migrations and b
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ImportKey() -> () {}
+fn ImportKey() {}

 #[utoipa::path(post,
    path = "/v2/UpdateKey",
@@ -378,29 +425,25 @@ Updates information about the specified API access key.
 *Note: the secret key is not returned in the response, `null` is sent instead.*
    ",
    request_body = UpdateKeyRequestBody,
-    params(
-        ("id", description = "Access key ID"),
-    ),
+    params(UpdateKeyRequest),
 	responses(
            (status = 200, description = "Access key has been updated", body = UpdateKeyResponse),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn UpdateKey() -> () {}
+fn UpdateKey() {}

 #[utoipa::path(post,
    path = "/v2/DeleteKey",
    tag = "Access key",
    description = "Delete a key from the cluster. Its access will be removed from all the buckets. Buckets are not automatically deleted and can be dangling. You should manually delete them before. ",
-    params(
-        ("id", description = "Access key ID"),
-    ),
+    params(DeleteKeyRequest),
 	responses(
            (status = 200, description = "Access key has been deleted"),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn DeleteKey() -> () {}
+fn DeleteKey() {}

 // **********************************************
 //      Bucket operations
@@ -415,7 +458,7 @@ fn DeleteKey() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ListBuckets() -> () {}
+fn ListBuckets() {}

 #[utoipa::path(get,
    path = "/v2/GetBucketInfo",
@@ -432,7 +475,7 @@ and its quotas (if any).
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetBucketInfo() -> () {}
+fn GetBucketInfo() {}

 #[utoipa::path(post,
    path = "/v2/CreateBucket",
@@ -447,7 +490,7 @@ Technically, you can also specify both `globalAlias` and `localAlias` and that w
            (status = 500, description = "Internal server error")
        ),
 )]
-fn CreateBucket() -> () {}
+fn CreateBucket() {}

 #[utoipa::path(post,
    path = "/v2/UpdateBucket",
@@ -465,9 +508,7 @@ In `quotas`: new values of `maxSize` and `maxObjects` must both be specified, or
 to remove the quotas. An absent value will be considered the same as a `null`. It is not possible
 to change only one of the two quotas.
    ",
-    params(
-        ("id", description = "ID of the bucket to update"),
-    ),
+    params(UpdateBucketRequest),
    request_body = UpdateBucketRequestBody,
 	responses(
            (status = 200, description = "Bucket has been updated", body = UpdateBucketResponse),
@@ -475,7 +516,7 @@ to change only one of the two quotas.
            (status = 500, description = "Internal server error")
        ),
 )]
-fn UpdateBucket() -> () {}
+fn UpdateBucket() {}

 #[utoipa::path(post,
    path = "/v2/DeleteBucket",
@@ -485,9 +526,7 @@ Deletes a storage bucket. A bucket cannot be deleted if it is not empty.

 **Warning:** this will delete all aliases associated with the bucket!
    ",
-    params(
-        ("id", description = "ID of the bucket to delete"),
-    ),
+    params(DeleteBucketRequest),
 	responses(
            (status = 200, description = "Bucket has been deleted"),
            (status = 400, description = "Bucket is not empty"),
@@ -495,7 +534,7 @@ Deletes a storage bucket. A bucket cannot be deleted if it is not empty.
            (status = 500, description = "Internal server error")
        ),
 )]
-fn DeleteBucket() -> () {}
+fn DeleteBucket() {}

 #[utoipa::path(post,
    path = "/v2/CleanupIncompleteUploads",
@@ -507,7 +546,7 @@ fn DeleteBucket() -> () {}
            (status = 500, description = "Internal server error")
        ),
 )]
-fn CleanupIncompleteUploads() -> () {}
+fn CleanupIncompleteUploads() {}

 #[utoipa::path(get,
    path = "/v2/InspectObject",
@@ -529,7 +568,7 @@ upload is in progress and not yet finished.
            (status = 500, description = "Internal server error")
        ),
 )]
-fn InspectObject() -> () {}
+fn InspectObject() {}

 // **********************************************
 //      Operations on permissions for keys on buckets
@@ -555,7 +594,7 @@ If you want to disallow read for the key, check the DenyBucketKey operation.
            (status = 500, description = "Internal server error")
        ),
 )]
-fn AllowBucketKey() -> () {}
+fn AllowBucketKey() {}

 #[utoipa::path(post,
    path = "/v2/DenyBucketKey",
@@ -577,7 +616,7 @@ If you want the key to have the reading permission, check the AllowBucketKey ope
            (status = 500, description = "Internal server error")
        ),
 )]
-fn DenyBucketKey() -> () {}
+fn DenyBucketKey() {}

 // **********************************************
 //      Operations on bucket aliases
@@ -587,25 +626,43 @@ fn DenyBucketKey() -> () {}
    path = "/v2/AddBucketAlias",
    tag = "Bucket alias",
    description = "Add an alias for the target bucket.  This can be either a global or a local alias, depending on which fields are specified.",
-    request_body = AddBucketAliasRequest,
+    request_body = BucketAliasEnumOpenapi,
 	responses(
            (status = 200, description = "Returns exhaustive information about the bucket", body = AddBucketAliasResponse),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn AddBucketAlias() -> () {}
+fn AddBucketAlias() {}

 #[utoipa::path(post,
    path = "/v2/RemoveBucketAlias",
    tag = "Bucket alias",
    description = "Remove an alias for the target bucket.  This can be either a global or a local alias, depending on which fields are specified.",
-    request_body = RemoveBucketAliasRequest,
+    request_body = BucketAliasEnumOpenapi,
 	responses(
            (status = 200, description = "Returns exhaustive information about the bucket", body = RemoveBucketAliasResponse),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn RemoveBucketAlias() -> () {}
+fn RemoveBucketAlias() {}
+
+// Hack for issue #1249 (see UpdateClusterLayout)
+#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
+#[serde(untagged)]
+#[schema(as = BucketAliasEnum)]
+pub enum BucketAliasEnumOpenapi {
+	#[serde(rename_all = "camelCase")]
+	Global {
+		bucket_id: String,
+		global_alias: String,
+	},
+	#[serde(rename_all = "camelCase")]
+	Local {
+		bucket_id: String,
+		local_alias: String,
+		access_key_id: String,
+	},
+}

 // **********************************************
 //      Node operations
@@ -617,15 +674,13 @@ fn RemoveBucketAlias() -> () {}
    description = "
 Return information about the Garage daemon running on one or several nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalGetNodeInfoResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetNodeInfo() -> () {}
+fn GetNodeInfo() {}

 #[utoipa::path(get,
    path = "/v2/GetNodeStatistics",
@@ -635,15 +690,13 @@ Fetch statistics for one or several Garage nodes.

 *Note: do not try to parse the `freeform` field of the response, it is given as a string specifically because its format is not stable.*
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalGetNodeStatisticsResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetNodeStatistics() -> () {}
+fn GetNodeStatistics() {}

 #[utoipa::path(post,
    path = "/v2/CreateMetadataSnapshot",
@@ -651,15 +704,13 @@ fn GetNodeStatistics() -> () {}
    description = "
 Instruct one or several nodes to take a snapshot of their metadata databases.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalCreateMetadataSnapshotResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn CreateMetadataSnapshot() -> () {}
+fn CreateMetadataSnapshot() {}

 #[utoipa::path(post,
    path = "/v2/LaunchRepairOperation",
@@ -667,16 +718,14 @@ fn CreateMetadataSnapshot() -> () {}
    description = "
 Launch a repair operation on one or several cluster nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalLaunchRepairOperationRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalLaunchRepairOperationResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn LaunchRepairOperation() -> () {}
+fn LaunchRepairOperation() {}

 // **********************************************
 //      Worker operations
@@ -688,16 +737,14 @@ fn LaunchRepairOperation() -> () {}
    description = "
 List background workers currently running on one or several cluster nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalListWorkersRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalListWorkersResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ListWorkers() -> () {}
+fn ListWorkers() {}

 #[utoipa::path(post,
    path = "/v2/GetWorkerInfo",
@@ -705,16 +752,14 @@ fn ListWorkers() -> () {}
    description = "
 Get information about the specified background worker on one or several cluster nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalGetWorkerInfoRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalGetWorkerInfoResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetWorkerInfo() -> () {}
+fn GetWorkerInfo() {}

 #[utoipa::path(post,
    path = "/v2/GetWorkerVariable",
@@ -722,16 +767,14 @@ fn GetWorkerInfo() -> () {}
    description = "
 Fetch values of one or several worker variables, from one or several cluster nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalGetWorkerVariableRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalGetWorkerVariableResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetWorkerVariable() -> () {}
+fn GetWorkerVariable() {}

 #[utoipa::path(post,
    path = "/v2/SetWorkerVariable",
@@ -739,16 +782,14 @@ fn GetWorkerVariable() -> () {}
    description = "
 Set the value for a worker variable, on one or several cluster nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalSetWorkerVariableRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalSetWorkerVariableResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn SetWorkerVariable() -> () {}
+fn SetWorkerVariable() {}

 // **********************************************
 //      Block operations
@@ -760,15 +801,13 @@ fn SetWorkerVariable() -> () {}
    description = "
 List data blocks that are currently in an errored state on one or several Garage nodes.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalListBlockErrorsResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn ListBlockErrors() -> () {}
+fn ListBlockErrors() {}

 #[utoipa::path(post,
    path = "/v2/GetBlockInfo",
@@ -776,16 +815,14 @@ fn ListBlockErrors() -> () {}
    description = "
 Get detailed information about a data block stored on a Garage node, including all object versions and in-progress multipart uploads that contain a reference to this block.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalGetBlockInfoRequest,
 	responses(
            (status = 200, description = "Detailed block information", body = MultiResponse<LocalGetBlockInfoResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn GetBlockInfo() -> () {}
+fn GetBlockInfo() {}

 #[utoipa::path(post,
    path = "/v2/RetryBlockResync",
@@ -793,16 +830,14 @@ fn GetBlockInfo() -> () {}
    description = "
 Instruct Garage node(s) to retry the resynchronization of one or several missing data block(s).
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalRetryBlockResyncRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalRetryBlockResyncResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn RetryBlockResync() -> () {}
+fn RetryBlockResync() {}

 #[utoipa::path(post,
    path = "/v2/PurgeBlocks",
@@ -812,16 +847,14 @@ Purge references to one or several missing data blocks.

 This will remove all objects and in-progress multipart uploads that contain the specified data block(s). The objects will be permanently deleted from the buckets in which they appear. Use with caution.
    ",
-    params(
-        ("node", description = "Node ID to query, or `*` for all nodes, or `self` for the node responding to the request"),
-    ),
+    params(MultiRequestQueryParams),
    request_body = LocalPurgeBlocksRequest,
 	responses(
            (status = 200, description = "Responses from individual cluster nodes", body = MultiResponse<LocalPurgeBlocksResponse>),
            (status = 500, description = "Internal server error")
        ),
 )]
-fn PurgeBlocks() -> () {}
+fn PurgeBlocks() {}

 // **********************************************
 // **********************************************
@@ -843,11 +876,11 @@ impl Modify for SecurityAddon {
 #[derive(OpenApi)]
 #[openapi(
    info(
-        version = "v2.0.0",
+        version = "v2.2.0",
        title = "Garage administration API",
-        description = "Administrate your Garage cluster programatically, including status, layout, keys, buckets, and maintainance tasks.
+        description = "Administrate your Garage cluster programmatically, including status, layout, keys, buckets, and maintenance tasks.

-*Disclaimer: This API may change in future Garage versions. Read the changelog and upgrade your scripts before upgrading. Additionnaly, this specification is early stage and can contain bugs, so be careful and please report any issues on our issue tracker.*",
+*Disclaimer: This API may change in future Garage versions. Read the changelog and upgrade your scripts before upgrading. Additionally, this specification is early stage and can contain bugs, so be careful and please report any issues on our issue tracker.*",
        contact(
            name = "The Garage team",
            email = "garagehq@deuxfleurs.fr",
@@ -872,6 +905,7 @@ impl Modify for SecurityAddon {
        CreateAdminToken,
        UpdateAdminToken,
        DeleteAdminToken,
+        GetCurrentAdminTokenInfo,
        // Layout operations
        GetClusterLayout,
        GetClusterLayoutHistory,
@@ -93,6 +93,15 @@ impl RequestHandler for LocalLaunchRepairOperationRequest {
 				info!("Repairing bucket aliases (foreground)");
 				garage.locked_helper().await.repair_aliases().await?;
 			}
+			RepairType::ClearResyncQueue => {
+				info!("Clearing resync queue (foreground)");
+				let garage = garage.clone();
+				tokio::task::spawn_blocking(move || {
+					garage.block_manager.resync.clear_resync_queue()
+				})
+				.await
+				.map_err(garage_util::error::Error::from)??;
+			}
 		}
 		Ok(LocalLaunchRepairOperationResponse)
 	}
@@ -336,7 +345,7 @@ impl BlockRcRepair {
 #[async_trait]
 impl Worker for BlockRcRepair {
 	fn name(&self) -> String {
-		format!("Block refcount repair worker")
+		"Block refcount repair worker".into()
 	}

 	fn status(&self) -> WorkerStatus {
@@ -40,6 +40,7 @@ impl AdminApiRequest {
 			POST CreateAdminToken (body),
 			POST UpdateAdminToken (body_field, query::id),
 			POST DeleteAdminToken (query::id),
+			GET GetCurrentAdminTokenInfo (admin_token),
 			// Layout endpoints
 			GET GetClusterLayout (),
 			GET GetClusterLayoutHistory (),
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_common"
-version = "2.0.0"
+version = "2.2.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -23,7 +23,7 @@ bytes.workspace = true
 chrono.workspace = true
 crc-fast.workspace = true
 crypto-common.workspace = true
-err-derive.workspace = true
+thiserror.workspace = true
 hex.workspace = true
 hmac.workspace = true
 md-5.workspace = true
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;

-use err_derive::Error;
 use hyper::StatusCode;
+use thiserror::Error;

 use garage_util::error::Error as GarageError;

@@ -12,48 +12,48 @@ use garage_model::helper::error::Error as HelperError;
 pub enum CommonError {
 	// ---- INTERNAL ERRORS ----
 	/// Error related to deeper parts of Garage
-	#[error(display = "Internal error: {}", _0)]
-	InternalError(#[error(source)] GarageError),
+	#[error("Internal error: {0}")]
+	InternalError(#[from] GarageError),

 	/// Error related to Hyper
-	#[error(display = "Internal error (Hyper error): {}", _0)]
-	Hyper(#[error(source)] hyper::Error),
+	#[error("Internal error (Hyper error): {0}")]
+	Hyper(#[from] hyper::Error),

 	/// Error related to HTTP
-	#[error(display = "Internal error (HTTP error): {}", _0)]
-	Http(#[error(source)] http::Error),
+	#[error("Internal error (HTTP error): {0}")]
+	Http(#[from] http::Error),

 	// ---- GENERIC CLIENT ERRORS ----
 	/// Proper authentication was not provided
-	#[error(display = "Forbidden: {}", _0)]
+	#[error("Forbidden: {0}")]
 	Forbidden(String),

 	/// Generic bad request response with custom message
-	#[error(display = "Bad request: {}", _0)]
+	#[error("Bad request: {0}")]
 	BadRequest(String),

 	/// The client sent a header with invalid value
-	#[error(display = "Invalid header value: {}", _0)]
-	InvalidHeader(#[error(source)] hyper::header::ToStrError),
+	#[error("Invalid header value: {0}")]
+	InvalidHeader(#[from] hyper::header::ToStrError),

 	// ---- SPECIFIC ERROR CONDITIONS ----
 	// These have to be error codes referenced in the S3 spec here:
 	// https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html#ErrorCodeList
 	/// The bucket requested don't exists
-	#[error(display = "Bucket not found: {}", _0)]
+	#[error("Bucket not found: {0}")]
 	NoSuchBucket(String),

 	/// Tried to create a bucket that already exist
-	#[error(display = "Bucket already exists")]
+	#[error("Bucket already exists")]
 	BucketAlreadyExists,

 	/// Tried to delete a non-empty bucket
-	#[error(display = "Tried to delete a non-empty bucket")]
+	#[error("Tried to delete a non-empty bucket")]
 	BucketNotEmpty,

 	// Category: bad request
 	/// Bucket name is not valid according to AWS S3 specs
-	#[error(display = "Invalid bucket name: {}", _0)]
+	#[error("Invalid bucket name: {0}")]
 	InvalidBucketName(String),
 }

@@ -150,7 +150,7 @@ impl TryFrom<HelperError> for CommonError {
 pub fn pass_helper_error(err: HelperError) -> CommonError {
 	match CommonError::try_from(err) {
 		Ok(e) => e,
-		Err(e) => panic!("Helper error `{}` should hot have happenned here", e),
+		Err(e) => panic!("Helper error `{}` should hot have happened here", e),
 	}
 }

--- a/Show More
+++ b/Show More