bump version to v2.4.0 and update api json schema

Merge pull request 'api/s3: don't panic when a version has no blocks' (#1522 ) from rajsinghtech/garage:fix/multipart-empty-blocks into main-v2
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1522
2026-09-06 20:19:15 +00:00 · 2026-09-06 19:43:04 +02:00 · 2026-09-06 07:49:47 +00:00 · 2026-09-04 03:19:07 +00:00 · 2026-09-04 00:01:32 +00:00
23 changed files with 172 additions and 53 deletions
@@ -1513,7 +1513,7 @@ dependencies = [

 [[package]]
 name = "garage"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "assert-json-diff",
 "async-trait",
@@ -1581,7 +1581,7 @@ dependencies = [

 [[package]]
 name = "garage_api_admin"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "argon2",
 "async-trait",
@@ -1613,7 +1613,7 @@ dependencies = [

 [[package]]
 name = "garage_api_common"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "base64 0.22.1",
 "bytes",
@@ -1649,7 +1649,7 @@ dependencies = [

 [[package]]
 name = "garage_api_k2v"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "base64 0.22.1",
 "futures",
@@ -1672,7 +1672,7 @@ dependencies = [

 [[package]]
 name = "garage_api_s3"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "aes-gcm",
 "async-compression",
@@ -1717,7 +1717,7 @@ dependencies = [

 [[package]]
 name = "garage_block"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arc-swap",
 "async-compression",
@@ -1741,7 +1741,7 @@ dependencies = [

 [[package]]
 name = "garage_db"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "fjall",
 "heed",
@@ -1756,7 +1756,7 @@ dependencies = [

 [[package]]
 name = "garage_model"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arbitrary",
 "argon2",
@@ -1784,7 +1784,7 @@ dependencies = [

 [[package]]
 name = "garage_net"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arc-swap",
 "bytes",
@@ -1810,7 +1810,7 @@ dependencies = [

 [[package]]
 name = "garage_rpc"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arc-swap",
 "async-trait",
@@ -1843,7 +1843,7 @@ dependencies = [

 [[package]]
 name = "garage_table"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arc-swap",
 "async-trait",
@@ -1864,7 +1864,7 @@ dependencies = [

 [[package]]
 name = "garage_util"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "arbitrary",
 "arc-swap",
@@ -1899,7 +1899,7 @@ dependencies = [

 [[package]]
 name = "garage_web"
-version = "2.3.0"
+version = "2.4.0"
 dependencies = [
 "garage_api_common",
 "garage_api_s3",
@@ -25,18 +25,18 @@ default-members = ["src/garage"]

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

 # External crates from crates.io
@@ -12,7 +12,7 @@
      "name": "AGPL-3.0",
      "identifier": "AGPL-3.0"
    },
-    "version": "v2.3.0"
+    "version": "v2.4.0"
  },
  "servers": [
    {
@@ -3321,10 +3321,35 @@
          "dbEngine"
        ],
        "properties": {
+          "addr": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "description": "Socket address used by other nodes to connect to this node for RPC"
+          },
+          "dataPartition": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/FreeSpaceResp",
+                "description": "Total and available space on the disk partition(s) containing the data\ndirectory(ies)"
+              }
+            ]
+          },
          "dbEngine": {
            "type": "string",
            "description": "database engine used for metadata"
          },
+          "draining": {
+            "type": [
+              "boolean",
+              "null"
+            ],
+            "description": "Whether this node is part of an older layout version and is draining data."
+          },
          "garageFeatures": {
            "type": [
              "array",
@@ -3346,9 +3371,38 @@
            ],
            "description": "hostname of this node"
          },
+          "isUp": {
+            "type": [
+              "boolean",
+              "null"
+            ],
+            "description": "Whether this node is connected in the cluster"
+          },
+          "metadataPartition": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/FreeSpaceResp",
+                "description": "Total and available space on the disk partition containing the\nmetadata directory"
+              }
+            ]
+          },
          "nodeId": {
            "type": "string"
          },
+          "role": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/NodeAssignedRole",
+                "description": "Role assigned to this node in the current cluster layout"
+              }
+            ]
+          },
          "rustVersion": {
            "type": "string",
            "description": "rustc version with which this garage release was compiled"
@@ -3684,10 +3738,35 @@
                "dbEngine"
              ],
              "properties": {
+                "addr": {
+                  "type": [
+                    "string",
+                    "null"
+                  ],
+                  "description": "Socket address used by other nodes to connect to this node for RPC"
+                },
+                "dataPartition": {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FreeSpaceResp",
+                      "description": "Total and available space on the disk partition(s) containing the data\ndirectory(ies)"
+                    }
+                  ]
+                },
                "dbEngine": {
                  "type": "string",
                  "description": "database engine used for metadata"
                },
+                "draining": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ],
+                  "description": "Whether this node is part of an older layout version and is draining data."
+                },
                "garageFeatures": {
                  "type": [
                    "array",
@@ -3709,9 +3788,38 @@
                  ],
                  "description": "hostname of this node"
                },
+                "isUp": {
+                  "type": [
+                    "boolean",
+                    "null"
+                  ],
+                  "description": "Whether this node is connected in the cluster"
+                },
+                "metadataPartition": {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "$ref": "#/components/schemas/FreeSpaceResp",
+                      "description": "Total and available space on the disk partition containing the\nmetadata directory"
+                    }
+                  ]
+                },
                "nodeId": {
                  "type": "string"
                },
+                "role": {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "$ref": "#/components/schemas/NodeAssignedRole",
+                      "description": "Role assigned to this node in the current cluster layout"
+                    }
+                  ]
+                },
                "rustVersion": {
                  "type": "string",
                  "description": "rustc version with which this garage release was compiled"
@@ -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.3.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.3.0` but it's up to you
+We encourage you to use a fixed tag (eg. `v2.4.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.4.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:

 ```
-docker pull dxflrs/garage:v2.3.0
+docker pull dxflrs/garage:v2.4.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.3.0
+  dxflrs/garage:v2.4.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.3.0
+    image: dxflrs/garage:v2.4.0
    network_mode: "host"
    restart: unless-stopped
    volumes:
@@ -111,7 +111,7 @@ your data to be persisted properly.

 ### Configuring initial access credentials

-Since `v2.3.0`, Garage can automatically create a default access key and a default storage bucket,
+Since `v2.n.0`, Garage can automatically create a default access key and a default storage bucket,
 based on values provided in environment variables.

 To use this feature, export the following environment variables:
@@ -157,7 +157,7 @@ docker run \
  -e GARAGE_DEFAULT_ACCESS_KEY \
  -e GARAGE_DEFAULT_SECRET_KEY \
  -e GARAGE_DEFAULT_BUCKET \
-  dxflrs/garage:v2.3.0
+  dxflrs/garage:v2.4.0
  /garage server --single-node --default-bucket
 ```

@@ -337,7 +337,7 @@ When you first start a cluster without automatic configuration, the output of `g
 ```
 ==== HEALTHY NODES ====
 ID                Hostname  Address         Tags  Zone  Capacity          DataAvail  Version
-563e1ac825ee3323  linuxbox  127.0.0.1:3901              NO ROLE ASSIGNED             v2.3.0
+563e1ac825ee3323  linuxbox  127.0.0.1:3901              NO ROLE ASSIGNED             v2.4.0
 ```

 Creating a cluster layout for a Garage deployment means informing Garage of the
@@ -2,8 +2,8 @@ apiVersion: v2
 name: garage
 description: S3-compatible object store for small self-hosted geo-distributed deployments
 type: application
-version: 0.9.3
-appVersion: "v2.3.0"
+version: 0.9.4
+appVersion: "v2.4.0"
 home: https://garagehq.deuxfleurs.fr/
 icon: https://garagehq.deuxfleurs.fr/images/garage-logo.svg

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

-![Version: 0.9.3](https://img.shields.io/badge/Version-0.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.0](https://img.shields.io/badge/AppVersion-v2.3.0-informational?style=flat-square)
+![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.4.0](https://img.shields.io/badge/AppVersion-v2.4.0-informational?style=flat-square)

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

@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_admin"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -876,7 +876,7 @@ impl Modify for SecurityAddon {
 #[derive(OpenApi)]
 #[openapi(
    info(
-        version = "v2.3.0",
+        version = "v2.4.0",
        title = "Garage administration API",
        description = "Administrate your Garage cluster programmatically, including status, layout, keys, buckets, and maintenance tasks.

@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_common"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_k2v"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_api_s3"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -698,9 +698,14 @@ fn body_from_blocks_range(
 	// range, as well as their "true offset", which is their actual offset in the complete
 	// file (whereas block.offset designates the offset of the block WITHIN THE PART
 	// block.part_number, which is not the same in the case of a multipart upload)
+	// A version with no blocks yields no data, so the capacity hint must not index
+	// into an empty slice.
+	let capacity_block_size = all_blocks
+		.first()
+		.map_or(1024, |(_, b)| std::cmp::max(b.size, 1024));
 	let mut blocks: Vec<(VersionBlock, u64)> = Vec::with_capacity(std::cmp::min(
 		all_blocks.len(),
-		4 + ((end - begin) / std::cmp::max(all_blocks[0].1.size, 1024)) as usize,
+		4 + ((end - begin) / capacity_block_size) as usize,
 	));
 	let mut block_offset: u64 = 0;
 	for (_, b) in all_blocks.iter() {
@@ -476,7 +476,13 @@ pub async fn handle_complete_multipart_upload(
 			size: total_size,
 			etag: etag.clone(),
 		},
-		final_version.blocks.items()[0].1.hash,
+		final_version
+			.blocks
+			.items()
+			.first()
+			.ok_or_internal_error("Multipart completion produced a final version with no blocks")?
+			.1
+			.hash,
 	));

 	let final_object = Object::new(*bucket_id, key.clone(), vec![object_version]);
@@ -1,6 +1,6 @@
 [package]
 name = "garage_block"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_db"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_net"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -1,6 +1,6 @@
 [package]
 name = "garage_web"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
 edition = "2018"
 license = "AGPL-3.0"
Author	SHA1	Message	Date
Alex Auvolat	073dd715ce	bump version to v2.4.0 and update api json schema	2026-09-06 19:43:04 +02:00
Alex	845db1afa1	Merge pull request 'api/s3: don't panic when a version has no blocks' (#1522 ) from rajsinghtech/garage:fix/multipart-empty-blocks into main-v2 Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1522	2026-09-06 07:49:47 +00:00
Raj Singh	c54077af73	api/s3: don't panic when reading a version with no blocks body_from_blocks_range indexed all_blocks[0] to size a capacity hint. A version with zero blocks made that index panic and kill the process on a plain GET, the read-side twin of the CompleteMultipartUpload panic at multipart.rs:479. Fall back to the existing 1024 floor when the slice is empty; with a non-empty slice the hint is unchanged.	2026-09-04 03:19:07 +00:00
Raj Singh	f38f001bad	api/s3: don't panic when final multipart version has no blocks CompleteMultipartUpload builds the final version and then reads `final_version.blocks.items()[0]` unconditionally. When the assembled version ends up with an empty block list the index panics and the process dies before it can answer the request: panicked at src/api/s3/multipart.rs:479:3: index out of bounds: the len is 0 but the index is 0 Use `.first()` and return an internal error instead, matching how the rest of this file handles missing data. The empty-block case is an internal consistency condition rather than a malformed request, so it maps to an internal error rather than a 4xx. The same panic was reported earlier in #1403, at multipart.rs:483 on v2.2.0. That report was closed without a fix after the reporter moved off consistency_mode = "dangerous". Closes #1521	2026-09-04 00:01:32 +00:00