From 9d74c3c2b1a08ad171d14bb78cc59273434030e3 Mon Sep 17 00:00:00 2001 From: Sven Anderson Date: Tue, 16 Aug 2022 20:19:18 +0900 Subject: [PATCH] go-ceph: change mature preview APIs to stable Signed-off-by: Sven Anderson --- common/log/log.go | 3 -- docs/api-status.json | 70 +++++++++++++++----------------------- docs/api-status.md | 14 ++------ rados/rados_set_locator.go | 3 -- rgw/admin/link.go | 3 -- rgw/admin/subuser.go | 3 -- 6 files changed, 29 insertions(+), 67 deletions(-) diff --git a/common/log/log.go b/common/log/log.go index 19837b1..e0e4402 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -1,6 +1,3 @@ -//go:build ceph_preview -// +build ceph_preview - // Package log allows to enable go-ceph logging and integrate it with the // logging of the go-ceph consuming code. package log diff --git a/docs/api-status.json b/docs/api-status.json index 58cd0c6..4f5edf6 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -1009,15 +1009,13 @@ { "name": "ReadOp.Read", "comment": "Read bytes from offset into buffer.\nlen(buffer) is the maximum number of bytes read from the object.\nbuffer[:ReadOpReadStep.BytesRead] then contains object data.\n\nImplements:\n void rados_read_op_read(rados_read_op_t read_op,\n uint64_t offset,\n size_t len,\n char * buffer,\n size_t * bytes_read,\n int * prval)\n" + }, + { + "name": "IOContext.SetLocator", + "comment": "SetLocator sets the key for mapping objects to pgs within an io context.\nUntil a different locator key is set, all objects in this io context will be placed in the same pg.\nTo reset the locator, an empty string must be set.\n\nImplements:\n void rados_ioctx_locator_set_key(rados_ioctx_t io, const char *key);\n" } ], "preview_api": [ - { - "name": "IOContext.SetLocator", - "comment": "SetLocator sets the key for mapping objects to pgs within an io context.\nUntil a different locator key is set, all objects in this io context will be placed in the same pg.\nTo reset the locator, an empty string must be set.\n\nImplements:\n void rados_ioctx_locator_set_key(rados_ioctx_t io, const char *key);\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, { "name": "IOContext.SetAllocationHint", "comment": "SetAllocationHint sets allocation hint for an object. This is an advisory\noperation, it will always succeed (as if it was submitted with a\nLIBRADOS_OP_FLAG_FAILOK flag set) and is not guaranteed to do anything on\nthe backend.\n\nImplements:\n int rados_set_alloc_hint2(rados_ioctx_t io,\n const char *o,\n uint64_t expected_object_size,\n uint64_t expected_write_size,\n uint32_t flags);\n", @@ -1756,36 +1754,6 @@ }, "rgw/admin": { "preview_api": [ - { - "name": "API.UnlinkBucket", - "comment": "UnlinkBucket unlink a bucket from a specified user\nPrimarily useful for changing bucket ownership.\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, - { - "name": "API.LinkBucket", - "comment": "LinkBucket will link a bucket to a specified user\nunlinking the bucket from any previous user\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, - { - "name": "API.CreateSubuser", - "comment": "CreateSubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#create-subuser\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, - { - "name": "API.RemoveSubuser", - "comment": "RemoveSubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#remove-subuser\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, - { - "name": "API.ModifySubuser", - "comment": "ModifySubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#modify-subuser\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" - }, { "name": "API.ListUsersBuckets", "comment": "ListUsersBuckets will return the list of all users buckets without stat.\n", @@ -1892,6 +1860,26 @@ { "name": "API.RemoveUserCap", "comment": "RemoveUserCap removes the capabilities from a user.\nOn Success, it returns the updated list of UserCaps for the user.\n" + }, + { + "name": "API.UnlinkBucket", + "comment": "UnlinkBucket unlink a bucket from a specified user\nPrimarily useful for changing bucket ownership.\n" + }, + { + "name": "API.LinkBucket", + "comment": "LinkBucket will link a bucket to a specified user\nunlinking the bucket from any previous user\n" + }, + { + "name": "API.CreateSubuser", + "comment": "CreateSubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#create-subuser\n" + }, + { + "name": "API.RemoveSubuser", + "comment": "RemoveSubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#remove-subuser\n" + }, + { + "name": "API.ModifySubuser", + "comment": "ModifySubuser - https://docs.ceph.com/en/latest/radosgw/adminops/#modify-subuser\n" } ] }, @@ -1923,18 +1911,14 @@ ] }, "common/log": { - "preview_api": [ + "stable_api": [ { "name": "SetWarnf", - "comment": "SetWarnf sets the log.Printf compatible receiver for warning logs.\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" + "comment": "SetWarnf sets the log.Printf compatible receiver for warning logs.\n" }, { "name": "SetDebugf", - "comment": "SetDebugf sets the log.Printf compatible receiver for debug logs.\n", - "added_in_version": "v0.15.0", - "expected_stable_version": "v0.17.0" + "comment": "SetDebugf sets the log.Printf compatible receiver for debug logs.\n" } ] }, diff --git a/docs/api-status.md b/docs/api-status.md index 36d52a8..c76fbc5 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -25,7 +25,6 @@ Name | Deprecated in Version | Expected Removal Version | Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -IOContext.SetLocator | v0.15.0 | v0.17.0 | IOContext.SetAllocationHint | v0.17.0 | v0.19.0 | WriteOp.SetAllocationHint | v0.17.0 | v0.19.0 | IOContext.Alignment | v0.17.0 | v0.19.0 | @@ -57,11 +56,6 @@ No Preview/Deprecated APIs found. All APIs are considered stable. Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -API.UnlinkBucket | v0.15.0 | v0.17.0 | -API.LinkBucket | v0.15.0 | v0.17.0 | -API.CreateSubuser | v0.15.0 | v0.17.0 | -API.RemoveSubuser | v0.15.0 | v0.17.0 | -API.ModifySubuser | v0.15.0 | v0.17.0 | API.ListUsersBuckets | v0.17.0 | v0.19.0 | API.ListUsersBucketsWithStat | v0.17.0 | v0.19.0 | API.CreateKey | v0.17.0 | v0.19.0 | @@ -74,12 +68,7 @@ No Preview/Deprecated APIs found. All APIs are considered stable. ## Package: common/log -### Preview APIs - -Name | Added in Version | Expected Stable Version | ----- | ---------------- | ----------------------- | -SetWarnf | v0.15.0 | v0.17.0 | -SetDebugf | v0.15.0 | v0.17.0 | +No Preview/Deprecated APIs found. All APIs are considered stable. ## Package: common/admin/nfs @@ -92,3 +81,4 @@ Admin.CreateCephFSExport | v0.16.0 | v0.18.0 | Admin.RemoveExport | v0.16.0 | v0.18.0 | Admin.ListDetailedExports | v0.16.0 | v0.18.0 | Admin.ExportInfo | v0.16.0 | v0.18.0 | + diff --git a/rados/rados_set_locator.go b/rados/rados_set_locator.go index 61d4675..771972d 100644 --- a/rados/rados_set_locator.go +++ b/rados/rados_set_locator.go @@ -1,6 +1,3 @@ -//go:build ceph_preview -// +build ceph_preview - package rados // #cgo LDFLAGS: -lrados diff --git a/rgw/admin/link.go b/rgw/admin/link.go index cc4174c..7237831 100644 --- a/rgw/admin/link.go +++ b/rgw/admin/link.go @@ -1,6 +1,3 @@ -//go:build ceph_preview -// +build ceph_preview - package admin import ( diff --git a/rgw/admin/subuser.go b/rgw/admin/subuser.go index 9e2af2c..fe96497 100644 --- a/rgw/admin/subuser.go +++ b/rgw/admin/subuser.go @@ -1,6 +1,3 @@ -//go:build ceph_preview -// +build ceph_preview - package admin import (