]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34838 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Jun 2020 19:01:49 +0000 (12:01 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Jun 2020 19:01:52 +0000 (12:01 -0700)
* 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 <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
qa/tasks/vstart_runner.py

index 2b13651769cd7417db3b7a263ad97a3d815964f0,314cef7a4e51358b3e165831355d93d96e180d40..0e5f5d3afa25fe309598c8c4ed6c5d85867580d1
@@@ -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))