From c2e03fe3bb3dd84f97b87a1f5304c90a2fb46164 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 8 Jun 2023 11:08:20 +0530 Subject: [PATCH] cephfs/admin: Make subvolume metadata APIs stable Signed-off-by: Anoop C S --- cephfs/admin/metadata.go | 4 +-- cephfs/admin/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/metadata.go b/cephfs/admin/metadata.go index 4118311..ceed023 100644 --- a/cephfs/admin/metadata.go +++ b/cephfs/admin/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/metadata_test.go b/cephfs/admin/metadata_test.go index c54315e..1362a48 100644 --- a/cephfs/admin/metadata_test.go +++ b/cephfs/admin/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 b72e97e..625c8da 100644 --- a/docs/api-status.json +++ b/docs/api-status.json @@ -534,6 +534,36 @@ "comment": "GetFailure returns details about the CloneStatus when in CloneFailed state.\n\nSimilar To:\n Reading the .failure object from the JSON returned by \"ceph fs subvolume\n snapshot clone\"\n", "added_in_version": "v0.16.0", "became_stable_version": "v0.18.0" + }, + { + "name": "FSAdmin.GetMetadata", + "comment": "GetMetadata gets custom metadata on the subvolume in a volume belonging to\nan optional subvolume group based on provided key name.\n\nSimilar To:\n\n\tceph fs subvolume metadata get [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.SetMetadata", + "comment": "SetMetadata sets custom metadata on the subvolume in a volume belonging to\nan optional subvolume group as a key-value pair.\n\nSimilar To:\n\n\tceph fs subvolume metadata set [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.RemoveMetadata", + "comment": "RemoveMetadata removes custom metadata set on the subvolume in a volume\nbelonging to an optional subvolume group using the metadata key.\n\nSimilar To:\n\n\tceph fs subvolume metadata rm [--group_name ]\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.ForceRemoveMetadata", + "comment": "ForceRemoveMetadata attempt to forcefully remove custom metadata set on\nthe subvolume in a volume belonging to an optional subvolume group using\nthe metadata key.\n\nSimilar To:\n\n\tceph fs subvolume metadata rm [--group_name ] --force\n", + "added_in_version": "v0.20.0", + "became_stable_version": "v0.22.0" + }, + { + "name": "FSAdmin.ListMetadata", + "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" } ], "deprecated_api": [ @@ -545,36 +575,6 @@ } ], "preview_api": [ - { - "name": "FSAdmin.GetMetadata", - "comment": "GetMetadata gets custom metadata on the subvolume in a volume belonging to\nan optional subvolume group based on provided key name.\n\nSimilar To:\n ceph fs subvolume metadata get [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.SetMetadata", - "comment": "SetMetadata sets custom metadata on the subvolume in a volume belonging to\nan optional subvolume group as a key-value pair.\n\nSimilar To:\n ceph fs subvolume metadata set [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.RemoveMetadata", - "comment": "RemoveMetadata removes custom metadata set on the subvolume in a volume\nbelonging to an optional subvolume group using the metadata key.\n\nSimilar To:\n ceph fs subvolume metadata rm [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.ForceRemoveMetadata", - "comment": "ForceRemoveMetadata attempt to forcefully remove custom metadata set on\nthe subvolume in a volume belonging to an optional subvolume group using\nthe metadata key.\n\nSimilar To:\n ceph fs subvolume metadata rm [--group_name ] --force\n", - "added_in_version": "v0.20.0", - "expected_stable_version": "v0.22.0" - }, - { - "name": "FSAdmin.ListMetadata", - "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 ceph fs subvolume metadata ls [--group_name ]\n", - "added_in_version": "v0.20.0", - "expected_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 ceph fs subvolume snapshot metadata get [--group_name ]\n", diff --git a/docs/api-status.md b/docs/api-status.md index 3d09f01..7190ecd 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.GetMetadata | v0.20.0 | v0.22.0 | -FSAdmin.SetMetadata | v0.20.0 | v0.22.0 | -FSAdmin.RemoveMetadata | v0.20.0 | v0.22.0 | -FSAdmin.ForceRemoveMetadata | v0.20.0 | v0.22.0 | -FSAdmin.ListMetadata | v0.20.0 | v0.22.0 | FSAdmin.GetSnapshotMetadata | v0.20.0 | v0.22.0 | FSAdmin.SetSnapshotMetadata | v0.20.0 | v0.22.0 | FSAdmin.RemoveSnapshotMetadata | v0.20.0 | v0.22.0 |