RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #24455 into master

Browse Source 
* refs/pull/24455/head:
	qa: use timeout for fs asok operations

Reviewed-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-10-17 10:17:29 -07:00
commit 6345c3f80d
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/tasks/cephfs/filesystem.py
View File

@ -172,8 +172,10 @@ class CephCluster(object):
del self._ctx.ceph['ceph'].conf[subsys][key]
write_conf(self._ctx)
def json_asok(self, command, service_type, service_id):
proc = self.mon_manager.admin_socket(service_type, service_id, command)
def json_asok(self, command, service_type, service_id, timeout=None):
if timeout is None:
timeout = 15*60
proc = self.mon_manager.admin_socket(service_type, service_id, command, timeout=timeout)
response_data = proc.stdout.getvalue()
log.info("_json_asok output: {0}".format(response_data))
if response_data.strip():
@ -909,15 +911,15 @@ class Filesystem(MDSCluster):
return version
def mds_asok(self, command, mds_id=None):
def mds_asok(self, command, mds_id=None, timeout=None):
if mds_id is None:
mds_id = self.get_lone_mds_id()
return self.json_asok(command, 'mds', mds_id)
return self.json_asok(command, 'mds', mds_id, timeout=timeout)
def rank_asok(self, command, rank=0, status=None):
def rank_asok(self, command, rank=0, status=None, timeout=None):
info = self.get_rank(rank=rank, status=status)
return self.json_asok(command, 'mds', info['name'])
return self.json_asok(command, 'mds', info['name'], timeout=timeout)
def read_cache(self, path, depth=None):
cmd = ["dump", "tree", path]