melanie witt
db455548a1
The 'force' parameter of os-brick's disconnect_volume() method allows callers to ignore flushing errors and ensure that devices are being removed from the host. We should use force=True when we are going to delete an instance to avoid leaving leftover devices connected to the compute host which could then potentially be reused to map to volumes to an instance that should not have access to those volumes. We can use force=True even when disconnecting a volume that will not be deleted on termination because os-brick will always attempt to flush and disconnect gracefully before forcefully removing devices. Closes-Bug: #2004555 Change-Id: I3629b84d3255a8fe9d8a7cea8c6131d7c40899e8
131 lines
4.4 KiB
Python
131 lines
4.4 KiB
Python
# Copyright 2015 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
import abc
|
|
import os
|
|
|
|
from nova import utils
|
|
from nova.virt.libvirt.volume import mount
|
|
from nova.virt.libvirt.volume import volume as libvirt_volume
|
|
|
|
|
|
class LibvirtBaseFileSystemVolumeDriver(
|
|
libvirt_volume.LibvirtBaseVolumeDriver, metaclass=abc.ABCMeta):
|
|
"""The base class for file system type volume drivers"""
|
|
|
|
def __init__(self, host):
|
|
super(LibvirtBaseFileSystemVolumeDriver,
|
|
self).__init__(host, is_block_dev=False)
|
|
|
|
@abc.abstractmethod
|
|
def _get_mount_point_base(self):
|
|
"""Return the mount point path prefix.
|
|
|
|
This is used to build the device path.
|
|
|
|
:returns: The mount point path prefix.
|
|
"""
|
|
raise NotImplementedError('_get_mount_point_base')
|
|
|
|
def _normalize_export(self, export):
|
|
"""Normalize the export (share) if necessary.
|
|
|
|
Subclasses should override this method if they have a non-standard
|
|
export value, e.g. if the export is a URL. By default this method just
|
|
returns the export value passed in unchanged.
|
|
|
|
:param export: The export (share) value to normalize.
|
|
:returns: The normalized export value.
|
|
"""
|
|
return export
|
|
|
|
def _get_mount_path(self, connection_info):
|
|
"""Returns the mount path prefix using the mount point base and share.
|
|
|
|
:param connection_info: dict of the form
|
|
|
|
::
|
|
|
|
connection_info = {
|
|
'data': {
|
|
'export': the file system share,
|
|
...
|
|
}
|
|
...
|
|
}
|
|
|
|
:returns: The mount path prefix.
|
|
"""
|
|
share = self._normalize_export(connection_info['data']['export'])
|
|
return os.path.join(self._get_mount_point_base(),
|
|
utils.get_hash_str(share))
|
|
|
|
def _get_device_path(self, connection_info):
|
|
"""Returns the hashed path to the device.
|
|
|
|
:param connection_info: dict of the form
|
|
|
|
::
|
|
|
|
connection_info = {
|
|
'data': {
|
|
'export': the file system share,
|
|
'name': the name of the device,
|
|
...
|
|
}
|
|
...
|
|
}
|
|
|
|
:returns: The full path to the device.
|
|
"""
|
|
mount_path = self._get_mount_path(connection_info)
|
|
return os.path.join(mount_path, connection_info['data']['name'])
|
|
|
|
|
|
class LibvirtMountedFileSystemVolumeDriver(LibvirtBaseFileSystemVolumeDriver,
|
|
metaclass=abc.ABCMeta):
|
|
# NOTE(mdbooth): Hopefully we'll get to the point where everything which
|
|
# previously subclassed LibvirtBaseFileSystemVolumeDriver now subclasses
|
|
# LibvirtMountedFileSystemVolumeDriver. If we get there, we should fold
|
|
# this class into the base class.
|
|
def __init__(self, host, fstype):
|
|
super(LibvirtMountedFileSystemVolumeDriver, self).__init__(host)
|
|
|
|
self.fstype = fstype
|
|
|
|
def connect_volume(self, connection_info, instance):
|
|
"""Connect the volume."""
|
|
export = connection_info['data']['export']
|
|
vol_name = connection_info['data']['name']
|
|
mountpoint = self._get_mount_path(connection_info)
|
|
|
|
mount.mount(self.fstype, export, vol_name, mountpoint, instance,
|
|
self._mount_options(connection_info))
|
|
|
|
connection_info['data']['device_path'] = \
|
|
self._get_device_path(connection_info)
|
|
|
|
def disconnect_volume(self, connection_info, instance, force=False):
|
|
"""Disconnect the volume."""
|
|
vol_name = connection_info['data']['name']
|
|
mountpoint = self._get_mount_path(connection_info)
|
|
|
|
mount.umount(vol_name, mountpoint, instance)
|
|
|
|
@abc.abstractmethod
|
|
def _mount_options(self, connection_info):
|
|
"""Return a list of additional arguments to pass to the mount command.
|
|
"""
|
|
pass
|