Browse Source

Remove umount from volume.filters

Use umount to umount volumes via oslo.privsep.

Change-Id: I83972fbfaf0842800c65ed8c391e2089de9807fe
Signed-off-by: Chuck Short <chucks@redhat.com>
changes/54/611654/2
Chuck Short 3 years ago
parent
commit
923fc52074
  1. 29
      cinder/privsep/fs.py
  2. 3
      cinder/volume/drivers/nexenta/nfs.py
  3. 1
      etc/cinder/rootwrap.d/volume.filters

29
cinder/privsep/fs.py

@ -0,0 +1,29 @@
# Copyright 2018 Red Hat, Inc
# Copyright 2017 Rackspace Australia
# Copyright 2018 Michael Still and Aptira
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
Helpers for filesystem related routines.
"""
from oslo_concurrency import processutils
import cinder.privsep
@cinder.privsep.sys_admin_pctxt.entrypoint
def umount(mountpoint):
processutils.execute('umount', mountpoint, attempts=1, delay_on_retry=True)

3
cinder/volume/drivers/nexenta/nfs.py

@ -28,6 +28,7 @@ from cinder import db
from cinder import exception
from cinder.i18n import _
from cinder import interface
import cinder.privsep.fs
from cinder.volume.drivers.nexenta import jsonrpc
from cinder.volume.drivers.nexenta import options
from cinder.volume.drivers.nexenta import utils
@ -451,7 +452,7 @@ class NexentaNfsDriver(nfs.NfsDriver): # pylint: disable=R0921
mount_path = self.remote_path(volume).strip(
'/%s' % self.VOLUME_FILE_NAME)
if mount_path in self._remotefsclient._read_mounts():
self._execute('umount', mount_path, run_as_root=True)
cinder.privsep.fs.umount(mount_path)
try:
props = nms.folder.get_child_props(folder, 'origin') or {}
nms.folder.destroy(folder, '-r')

1
etc/cinder/rootwrap.d/volume.filters

@ -118,7 +118,6 @@ netapp_nfs_touch: CommandFilter, touch, root
# cinder/volume/drivers/glusterfs.py
chgrp: CommandFilter, chgrp, root
umount: CommandFilter, umount, root
# cinder/brick/initiator/connector.py:
ls: CommandFilter, ls, root

Loading…
Cancel
Save