From 37b9a31fd003c1dbb3f69334c5bf004f95c21bb0 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 8 Jun 2023 11:11:52 +0530 Subject: [PATCH] cephfs/admin: Make subvolume snapshot metadata APIs stable Signed-off-by: Anoop C S --- cephfs/admin/snapshot_metadata.go | 4 +- cephfs/admin/snapshot_metadata_test.go | 4 +- docs/api-status.json | 60 +++++++++++++------------- docs/api-status.md | 5 --- 4 files changed, 34 insertions(+), 39 deletions(-) diff --git a/cephfs/admin/snapshot_metadata.go b/cephfs/admin/snapshot_metadata.go index 199f943..62681ea 100644 --- a/cephfs/admin/snapshot_metadata.go +++ b/cephfs/admin/snapshot_metadata.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/cephfs/admin/snapshot_metadata_test.go b/cephfs/admin/snapshot_metadata_test.go index 20a899c..6c1efac 100644 --- a/cephfs/admin/snapshot_metadata_test.go +++ b/cephfs/admin/snapshot_metadata_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 diff --git a/docs/api-status.json b/docs/api-status.json index 625c8da..4725a00 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -564,6 +564,36 @@ "comment": "ListMetadata lists custom metadata (key-value pairs) set on the subvolume\nin a volume belonging to an optional subvolume group.\n\nSimilar To:\n\n\tceph fs subvolume metadata ls [--group_name ]\n", "added_in_version": "v0.20.0", "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.GetSnapshotMetadata", + "comment": "GetSnapshotMetadata gets custom metadata on the subvolume snapshot in a\nvolume belonging to an optional subvolume group based on provided key name.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata get [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.SetSnapshotMetadata", + "comment": "SetSnapshotMetadata sets custom metadata on the subvolume snapshot in a\nvolume belonging to an optional subvolume group as a key-value pair.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata set [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.RemoveSnapshotMetadata", + "comment": "RemoveSnapshotMetadata removes custom metadata set on the subvolume\nsnapshot in a volume belonging to an optional subvolume group using the\nmetadata key.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata rm [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.ForceRemoveSnapshotMetadata", + "comment": "ForceRemoveSnapshotMetadata attempt to forcefully remove custom metadata\nset on the subvolume snapshot in a volume belonging to an optional\nsubvolume group using the metadata key.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata rm [--group_name ] --force\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.ListSnapshotMetadata", + "comment": "ListSnapshotMetadata lists custom metadata (key-value pairs) set on the subvolume\nsnapshot in a volume belonging to an optional subvolume group.\n\nSimilar To:\n\n\tceph fs subvolume snapshot metadata ls [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" } ], "deprecated_api": [ @@ -575,36 +605,6 @@ } ], "preview_api": [ - { - "name": "FSAdmin.GetSnapshotMetadata", - "comment": "GetSnapshotMetadata gets custom metadata on the subvolume snapshot in a\nvolume belonging to an optional subvolume group based on provided key name.\n\nSimilar To:\n ceph fs subvolume snapshot metadata get [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.SetSnapshotMetadata", - "comment": "SetSnapshotMetadata sets custom metadata on the subvolume snapshot in a\nvolume belonging to an optional subvolume group as a key-value pair.\n\nSimilar To:\n ceph fs subvolume snapshot metadata set [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.RemoveSnapshotMetadata", - "comment": "RemoveSnapshotMetadata removes custom metadata set on the subvolume\nsnapshot in a volume belonging to an optional subvolume group using the\nmetadata key.\n\nSimilar To:\n ceph fs subvolume snapshot metadata rm [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.ForceRemoveSnapshotMetadata", - "comment": "ForceRemoveSnapshotMetadata attempt to forcefully remove custom metadata\nset on the subvolume snapshot in a volume belonging to an optional\nsubvolume group using the metadata key.\n\nSimilar To:\n ceph fs subvolume snapshot metadata rm [--group_name ] --force\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.ListSnapshotMetadata", - "comment": "ListSnapshotMetadata lists custom metadata (key-value pairs) set on the subvolume\nsnapshot in a volume belonging to an optional subvolume group.\n\nSimilar To:\n ceph fs subvolume snapshot metadata ls [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, { "name": "FSAdmin.PinSubVolume", "comment": "PinSubVolume pins subvolume to ranks according to policies. A valid pin\nsetting value depends on the type of pin as described in the docs from\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#cephfs-pinning and\nhttps://docs.ceph.com/en/latest/cephfs/multimds/#setting-subtree-partitioning-policies\n\nSimilar To:\n\n\tceph fs subvolume pin \n", diff --git a/docs/api-status.md b/docs/api-status.md index 7190ecd..881153f 100644 --- a/docs/api-status.md +++ b/docs/api-status.md @@ -20,11 +20,6 @@ MountInfo.Futimes | v0.22.0 | v0.24.0 | Name | Added in Version | Expected Stable Version | ---- | ---------------- | ----------------------- | -FSAdmin.GetSnapshotMetadata | v0.20.0 | v0.22.0 | -FSAdmin.SetSnapshotMetadata | v0.20.0 | v0.22.0 | -FSAdmin.RemoveSnapshotMetadata | v0.20.0 | v0.22.0 | -FSAdmin.ForceRemoveSnapshotMetadata | v0.20.0 | v0.22.0 | -FSAdmin.ListSnapshotMetadata | v0.20.0 | v0.22.0 | FSAdmin.PinSubVolume | v0.21.0 | v0.23.0 | FSAdmin.PinSubVolumeGroup | v0.21.0 | v0.23.0 | FSAdmin.FetchVolumeInfo | v0.21.0 | v0.23.0 |