From: Patrick Donnelly Date: Tue, 2 Jun 2020 19:01:49 +0000 (-0700) Subject: Merge PR #34838 into master X-Git-Tag: v16.1.0~2178 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=182985455a100dd83e96d4ea318977223b00920e;p=ceph.git Merge PR #34838 into master * refs/pull/34838/head: vstart_runner: don't use namespaces by default qa/cephfs: run nsenter commands with superuser privileges qa/cephfs: look for mountpoint in cmdline file Reviewed-by: Xiubo Li Reviewed-by: Patrick Donnelly --- 182985455a100dd83e96d4ea318977223b00920e diff --cc qa/tasks/vstart_runner.py index 2b13651769cd,314cef7a4e51..0e5f5d3afa25 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@@ -585,13 -594,16 +594,16 @@@ class LocalKernelMount(KernelMount) if asok_conf: d = asok_conf.groups(1)[0] break - path = "{0}/client.{1}.{2}.asok".format(d, self.client_id, self.fuse_daemon.subproc.pid) - log.info("I think my launching pid was {0}".format(self.fuse_daemon.subproc.pid)) + path = "{0}/client.{1}.*.asok".format(d, self.client_id) return path - def mount(self, mount_path=None, mount_fs_name=None, mount_options=[]): + def mount(self, mount_path=None, mount_fs_name=None, mount_options=[], **kwargs): self.setupfs(name=mount_fs_name) - self.setup_netns() + if opt_use_ns: + self.using_namespace = True + self.setup_netns() + else: + self.using_namespace = False log.info('Mounting kclient client.{id} at {remote} {mnt}...'.format( id=self.client_id, remote=self.client_remote, mnt=self.mountpoint))