From: tengjie5 <tengjie5@asiainfo.com>
Date: Fri, 28 Jun 2024 02:14:34 +0000 (+0800)
Subject: cephfs-shell: excute cmd 'rmdir_helper' reported error
X-Git-Tag: testing/wip-xiubli-testing-20240730.020832-reef~7^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=59b48f61c1e5d9e20a6457668cd0db8d7e4be748;p=ceph-ci.git

cephfs-shell: excute cmd 'rmdir_helper' reported error

Fixes: https://tracker.ceph.com/issues/66735
Signed-off-by: teng jie <tengjie5@asiainfo.com>
(cherry picked from commit d8c3c45e00c1c2716365281fb51f66b8edee523a)
---

diff --git a/src/tools/cephfs/shell/cephfs-shell b/src/tools/cephfs/shell/cephfs-shell
index b7e8c55e21e..456f0c084ea 100755
--- a/src/tools/cephfs/shell/cephfs-shell
+++ b/src/tools/cephfs/shell/cephfs-shell
@@ -1014,9 +1014,9 @@ class CephFSShell(Cmd):
 
     @with_argparser(rmdir_parser)
     def do_rmdir(self, args):
-        self.do_rmdir_helper(args)
+        self._rmdir(args)
 
-    def do_rmdir_helper(self, args):
+    def _rmdir(self, args):
         """
         Remove a specific Directory
         """
@@ -1531,7 +1531,7 @@ class CephFSShell(Cmd):
             try:
                 if is_dir_exists(snap_dir):
                     newargs = argparse.Namespace(paths=[snap_dir], parent=False)
-                    self.do_rmdir_helper(newargs)
+                    self._rmdir(newargs)
                 else:
                     set_exit_code_msg(errno.ENOENT, "'{}': no such snapshot".format(
                         args.name.decode('utf-8')))