RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-04 15:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from dparmar18/fix_tracker_40860

Browse Source 
cephfs-shell: fix rmdir cmd

Reviewed-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Rishabh Dave 2022-05-24 16:10:26 +05:30 committed by GitHub
commit 9368f4fe6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions

30
src/tools/cephfs/cephfs-shell
View File

@ -883,14 +883,14 @@ class CephFSShell(Cmd):
"""
return self.complete_filenames(text, line, begidx, endidx)
rmdir_parser = argparse.ArgumentParser(description='Remove Directory.')
rmdir_parser.add_argument('paths', help='Directory Path.', nargs='+',
rmdir_parser = argparse.ArgumentParser(
description='Remove the directory(ies), if they are empty.')
rmdir_parser.add_argument('paths', help='Directory Path(s)', nargs='+',
action=path_to_bytes)
rmdir_parser.add_argument('-p', '--parent', action='store_true',
help='Remove parent directories as necessary. '
'When this option is specified, no error '
'is reported if a directory has any '
'sub-directories, files')
help="remove directory and its ancestors; "
"e.g., 'rmdir -p a/b/c' is similar to "
"'rmdir a/b/c a/b a'")
@with_argparser(rmdir_parser)
def do_rmdir(self, args):
@ -940,7 +940,23 @@ class CephFSShell(Cmd):
try:
cephfs.rmdir(path)
except libcephfs.Error as e:
set_exit_code_msg(msg=e)
if e.get_error_code() == 2:
set_exit_code_msg(e.get_error_code(),
"rmdir: failed to remove "
f"{path.decode('utf-8')}: "
"No such file or directory")
elif e.get_error_code() == 20:
set_exit_code_msg(e.get_error_code(),
"rmdir: failed to remove "
f"{path.decode('utf-8')}: "
"Not a directory")
elif e.get_error_code() == 39:
set_exit_code_msg(e.get_error_code(),
"rmdir: failed to remove "
f"{path.decode('utf-8')}: "
"Directory not empty")
else:
set_exit_code_msg(msg=e)
def complete_rm(self, text, line, begidx, endidx):
"""