RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #35857 into master

Browse Source 
* refs/pull/35857/head:
	pybind/mgr/volumes: fix volume search for pools

Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-07-08 19:19:34 -07:00
commit e2ccc2cb16
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pybind/mgr/volumes/fs/operations/volume.py
View File

@ -2,6 +2,8 @@ import errno
import logging
import sys
from typing import List
from contextlib import contextmanager
import orchestrator
@ -26,12 +28,15 @@ def get_pool_names(mgr, volname):
return metadata and data pools (list) names of volume as a tuple
"""
fs_map = mgr.get("fs_map")
metadata_pool_id = None
data_pool_ids = [] # type: List[int]
for f in fs_map['filesystems']:
if volname == f['mdsmap']['fs_name']:
metadata_pool_id = f['mdsmap']['metadata_pool']
data_pool_ids = f['mdsmap']['data_pools']
else:
return None, None
break
if metadata_pool_id is None:
return None, None
osdmap = mgr.get("osd_map")
pools = dict([(p['pool'], p['pool_name']) for p in osdmap['pools']])