Merge branch 'master' of github.com:ceph/teuthology

This commit is contained in:
tamil 2013-06-13 16:27:05 -07:00
commit 662fd9ecd8
2 changed files with 3 additions and 3 deletions

View File

@ -571,7 +571,7 @@ class CephManager:
while True:
out = self.raw_cluster_cmd('--', 'pg',pgid,'list_missing',
json.dumps(offset))
j = json.loads('\n'.join(out.split('\n')[1:]))
j = json.loads(out)
if r is None:
r = j
else:
@ -643,7 +643,7 @@ class CephManager:
def get_stuck_pgs(self, type_, threshold):
out = self.raw_cluster_cmd('pg','dump_stuck', type_,
'--format=json', '-t', str(threshold))
return json.loads('\n'.join(out.split('\n')[1:]))
return json.loads(out)
def get_num_unfound_objects(self):
status = self.raw_cluster_status()

View File

@ -83,7 +83,7 @@ def task(ctx, config):
for pg in pgs:
out = manager.raw_cluster_cmd('pg', pg['pgid'], 'query')
log.debug("out string %s",out)
j = json.loads('\n'.join(out.split('\n')[1:]))
j = json.loads(out)
log.info("pg is %s, query json is %s", pg, j)
if pg['state'].count('down'):