gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-05 12:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

layout: make optional version mandatory in apply layout changes

Browse Source
This commit is contained in:
Alex Auvolat
2025-03-11 10:05:02 +01:00
parent 5f308bd688
commit 1f645830a4
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/cluster.rs
+2 -2
View File
@@ -404,7 +404,7 @@ impl RequestHandler for PreviewClusterLayoutChangesRequest {
) -> Result<PreviewClusterLayoutChangesResponse, Error> {
let layout = garage.system.cluster_layout().inner().clone();
let new_ver = layout.current().version + 1;
match layout.apply_staged_changes(Some(new_ver)) {
match layout.apply_staged_changes(new_ver) {
Err(GarageError::Message(error)) => {
Ok(PreviewClusterLayoutChangesResponse::Error { error })
}
@@ -426,7 +426,7 @@ impl RequestHandler for ApplyClusterLayoutRequest {
_admin: &Admin,
) -> Result<ApplyClusterLayoutResponse, Error> {
let layout = garage.system.cluster_layout().inner().clone();
let (layout, msg) = layout.apply_staged_changes(Some(self.version))?;
let (layout, msg) = layout.apply_staged_changes(self.version)?;
garage
.system