Merge PR into master

* refs/pull/29144/head:
	qa/tasks/ceph_manager: fix thrash_pg_upmap_items when no pools

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2019-07-22 13:38:13 -05:00
commit 46e4d1a0d5

View File

@ -537,6 +537,8 @@ class Thrasher:
try:
if random.random() >= .3:
pgs = self.ceph_manager.get_pg_stats()
if not pgs:
return
pg = random.choice(pgs)
pgid = str(pg['pgid'])
poolid = int(pgid.split('.')[0])