Merge PR ceph#62136 into main

* refs/pull/62136/head:
	qa: add test case for remove xattr
	cephfs-shell: Add the option to remove xattr

Reviewed-by: Patrick Donnelly <[email protected]>

Author: batrick

qa/tasks/cephfs/test_cephfs_shell.py

@@ -980,6 +980,13 @@ def test_non_existing_dir(self):
             cmd=['getxattr', self.dir_name, input_val[0]])
         self.negtest_cephfs_shell_cmd(cmd=['listxattr', self.dir_name])
 
+    def test_remove_xattr(self):
+        self.test_set()
+        self.get_cephfs_shell_cmd_output(
+            ['removexattr', self.dir_name, 'user.key'])
+        self.negtest_cephfs_shell_cmd(
+            cmd=['getxattr', self.dir_name, 'user.key'])
+
 
 class TestLS(TestCephFSShell):
     dir_name = 'test_dir'

src/tools/cephfs/shell/cephfs-shell

@@ -1664,6 +1664,22 @@ class CephFSShell(Cmd):
         except libcephfs.Error as e:
             set_exit_code_msg(msg=e)
 
+    removexattr_parser = argparse.ArgumentParser(
+        description='Remove extended attribute set for a file')
+    removexattr_parser.add_argument('path', type=str, action=path_to_bytes,
+                                    help='Name of the file')
+    removexattr_parser.add_argument('name', type=str, help='Extended attribute name')
+
+    @with_argparser(removexattr_parser)
+    def do_removexattr(self, args):
+        """
+        Remove extended attribute for a file
+        """
+        try:
+            poutput('{}'.format(cephfs.removexattr(args.path, to_bytes(args.name))))
+        except libcephfs.Error as e:
+            set_exit_code_msg(msg=e)
+
 
 #######################################################
 #