From 59c2ad10414774657c3d77e56146d5780db75f3f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Apr 2024 10:01:29 -0400 Subject: [PATCH 1/4] rbd: promote Image.Resize2 api to stable Signed-off-by: John Mulligan --- docs/api-status.json | 10 +++++----- docs/api-status.md | 1 - rbd/resize.go | 2 -- rbd/resize_test.go | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/docs/api-status.json b/docs/api-status.json index 7f1da8306..dd24a226e 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -1923,15 +1923,15 @@ "comment": "LockRelease releases a lock on the image.\n\nImplements:\n\n\tint rbd_lock_release(rbd_image_t image);\n", "added_in_version": "v0.22.0", "became_stable_version": "v0.24.0" - } - ], - "preview_api": [ + }, { "name": "Image.Resize2", "comment": "Resize2 resizes an rbd image and allows configuration of allow_shrink and a callback function. The callback\nfunction will be called with the first argument as the progress, the second argument as the total, and the third\nargument as an opaque value that is passed to the Resize2 function's data argument in each callback execution.\nThe resize operation will be aborted if the progress callback returns a non-zero value.\n\nImplements:\n\n\tint rbd_resize2(rbd_image_t image, uint64_t size, allow_shrink bool, librbd_progress_fn_t cb, void *cbdata);\n", "added_in_version": "v0.25.0", - "expected_stable_version": "v0.27.0" - }, + "became_stable_version": "v0.27.0" + } + ], + "preview_api": [ { "name": "Image.GetSnapGroupNamespace", "comment": "GetSnapGroupNamespace returns the SnapGroupNamespace of the snapshot which\nis part of a group. The caller should make sure that the snapshot ID passed\nin this function belongs to a snapshot that was taken as part of a group\nsnapshot.\n\nImplements:\n\n\t\tint rbd_snap_get_group_namespace(rbd_image_t image, uint64_t snap_id,\n\t rbd_snap_group_namespace_t *group_snap,\n\t size_t group_snap_size)\n", diff --git a/docs/api-status.md b/docs/api-status.md index 70292bc09..31f0fba9a 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -24,7 +24,6 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -Image.Resize2 | v0.25.0 | v0.27.0 | Image.GetSnapGroupNamespace | $NEXT_RELEASE | $NEXT_RELEASE_STABLE | ### Deprecated APIs diff --git a/rbd/resize.go b/rbd/resize.go index 05a692e64..00f1187d8 100644 --- a/rbd/resize.go +++ b/rbd/resize.go @@ -1,5 +1,3 @@ -//go:build ceph_preview - package rbd /* diff --git a/rbd/resize_test.go b/rbd/resize_test.go index 242750991..817f93850 100644 --- a/rbd/resize_test.go +++ b/rbd/resize_test.go @@ -1,5 +1,3 @@ -//go:build ceph_preview - package rbd import ( From 8c2be5a649a3d60cea172a2180d3ad9773df80ec Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Apr 2024 10:05:17 -0400 Subject: [PATCH 2/4] rgw/admin: promote GetInfo API to stable Signed-off-by: John Mulligan --- docs/api-status.json | 12 ++++++------ docs/api-status.md | 1 - rgw/admin/info.go | 4 ++-- rgw/admin/info_test.go | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/api-status.json b/docs/api-status.json index dd24a226e..36edad3da 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -2014,12 +2014,6 @@ }, "rgw/admin": { "preview_api": [ - { - "name": "API.GetInfo", - "comment": "GetInfo - https://docs.ceph.com/en/latest/radosgw/adminops/#info\n", - "added_in_version": "v0.25.0", - "expected_stable_version": "v0.27.0" - }, { "name": "API.GetBucketQuota", "comment": "GetBucketQuota - https://docs.ceph.com/en/latest/radosgw/adminops/#get-bucket-quota\n", @@ -2164,6 +2158,12 @@ "comment": "ListBucketsWithStat will return the list of all buckets with stat (system admin API only)\n", "added_in_version": "v0.20.0", "became_stable_version": "v0.22.0" + }, + { + "name": "API.GetInfo", + "comment": "GetInfo - https://docs.ceph.com/en/latest/radosgw/adminops/#info\n", + "added_in_version": "v0.25.0", + "became_stable_version": "v0.27.0" } ] }, diff --git a/docs/api-status.md b/docs/api-status.md index 31f0fba9a..e5e8cc082 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -44,7 +44,6 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -API.GetInfo | v0.25.0 | v0.27.0 | API.GetBucketQuota | v0.26.0 | v0.28.0 | API.SetBucketQuota | v0.26.0 | v0.28.0 | diff --git a/rgw/admin/info.go b/rgw/admin/info.go index afacd8eb0..97ad497fe 100644 --- a/rgw/admin/info.go +++ b/rgw/admin/info.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus || pacific) && ceph_preview -// +build !nautilus,!octopus,!pacific,ceph_preview +//go:build !(nautilus || octopus || pacific) +// +build !nautilus,!octopus,!pacific package admin diff --git a/rgw/admin/info_test.go b/rgw/admin/info_test.go index d7a5c572c..148d7990a 100644 --- a/rgw/admin/info_test.go +++ b/rgw/admin/info_test.go @@ -1,5 +1,5 @@ -//go:build !(nautilus || octopus || pacific) && ceph_preview -// +build !nautilus,!octopus,!pacific,ceph_preview +//go:build !(nautilus || octopus || pacific) +// +build !nautilus,!octopus,!pacific package admin From 6e00c4adcb7cc179215c76fca9dc7979163be654 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Apr 2024 10:06:06 -0400 Subject: [PATCH 3/4] docs: fix version numbers for apis added prior to v0.27 Signed-off-by: John Mulligan --- docs/api-status.json | 8 ++++---- docs/api-status.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/api-status.json b/docs/api-status.json index 36edad3da..c3c290e9b 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -618,8 +618,8 @@ { "name": "FSAdmin.FSQuiesce", "comment": "FSQuiesce will quiesce the specified subvolumes in a volume.\nQuiescing a fs will prevent new writes to the subvolumes.\nSimilar To:\n\nceph fs quiesce \n", - "added_in_version": "$NEXT_RELEASE", - "expected_stable_version": "$NEXT_RELEASE_STABLE" + "added_in_version": "v0.27.0", + "expected_stable_version": "v0.29.0" } ] }, @@ -1935,8 +1935,8 @@ { "name": "Image.GetSnapGroupNamespace", "comment": "GetSnapGroupNamespace returns the SnapGroupNamespace of the snapshot which\nis part of a group. The caller should make sure that the snapshot ID passed\nin this function belongs to a snapshot that was taken as part of a group\nsnapshot.\n\nImplements:\n\n\t\tint rbd_snap_get_group_namespace(rbd_image_t image, uint64_t snap_id,\n\t rbd_snap_group_namespace_t *group_snap,\n\t size_t group_snap_size)\n", - "added_in_version": "$NEXT_RELEASE", - "expected_stable_version": "$NEXT_RELEASE_STABLE" + "added_in_version": "v0.27.0", + "expected_stable_version": "v0.29.0" } ] }, diff --git a/docs/api-status.md b/docs/api-status.md index e5e8cc082..400ae8afb 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -12,7 +12,7 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -FSAdmin.FSQuiesce | $NEXT_RELEASE | $NEXT_RELEASE_STABLE | +FSAdmin.FSQuiesce | v0.27.0 | v0.29.0 | ## Package: rados @@ -24,7 +24,7 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -Image.GetSnapGroupNamespace | $NEXT_RELEASE | $NEXT_RELEASE_STABLE | +Image.GetSnapGroupNamespace | v0.27.0 | v0.29.0 | ### Deprecated APIs From 8915160500d3d03fc1cac42a47054e0b12dbda2f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 8 Apr 2024 10:08:04 -0400 Subject: [PATCH 4/4] docs: update README for release v0.27.0 Signed-off-by: John Mulligan --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d5c5e4c7f..d8e3af257 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ go test -tags pacific .... | go-ceph version | Supported Ceph Versions | Deprecated Ceph Versions | | --------------- | ------------------------| -------------------------| +| v0.27.0 | pacific, quincy, reef | nautilus, octopus | | v0.26.0 | pacific, quincy, reef | nautilus, octopus | | v0.25.0 | pacific, quincy, reef | nautilus, octopus | | v0.24.0 | pacific, quincy, reef | nautilus, octopus |