]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45949 from neesingh-rh/feature-51434
authorVenky Shankar <vshankar@redhat.com>
Tue, 23 Aug 2022 16:03:09 +0000 (21:33 +0530)
committerGitHub <noreply@github.com>
Tue, 23 Aug 2022 16:03:09 +0000 (21:33 +0530)
mgr/volumes: Add volume info command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>
1  2 
doc/cephfs/fs-volumes.rst
qa/tasks/cephfs/test_volumes.py
src/pybind/mgr/volumes/fs/volume.py
src/pybind/mgr/volumes/module.py

Simple merge
Simple merge
index cfc7480d6b778fa26169488de965fdc7bd0c7d96,b45a70fdaed79364a25558e5ea0efd67cf77647b..335d76a809ab13db72128cd83eabbf75b10c589e
@@@ -8,12 -7,12 +8,12 @@@ import cephf
  
  from mgr_util import CephfsClient
  
 -from .fs_util import listdir
 +from .fs_util import listdir, has_subdir
  
- from .operations.volume import create_volume, \
-     delete_volume, rename_volume, list_volumes, open_volume, get_pool_names
  from .operations.group import open_group, create_group, remove_group, \
      open_group_unique, set_group_attrs
+ from .operations.volume import create_volume, delete_volume, rename_volume, \
+     list_volumes, open_volume, get_pool_names, get_pool_ids, get_pending_subvol_deletions_count
  from .operations.subvolume import open_subvol, create_subvol, remove_subvol, \
      create_clone
  from .operations.trash import Trash
Simple merge