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
64 lines
2.5 KiB
Python
64 lines
2.5 KiB
Python
# 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 nova.conf
|
|
from nova import utils
|
|
from nova.virt.libvirt.volume import volume as libvirt_volume
|
|
|
|
from os_brick import initiator
|
|
from os_brick.initiator import connector
|
|
|
|
from oslo_log import log as logging
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class LibvirtNVMEVolumeDriver(libvirt_volume.LibvirtVolumeDriver):
|
|
"""Driver to attach NVMe volumes to libvirt."""
|
|
|
|
def __init__(self, connection):
|
|
super(LibvirtNVMEVolumeDriver,
|
|
self).__init__(connection)
|
|
|
|
self.connector = connector.InitiatorConnector.factory(
|
|
initiator.NVME, utils.get_root_helper(),
|
|
use_multipath=CONF.libvirt.volume_use_multipath,
|
|
device_scan_attempts=CONF.libvirt.num_nvme_discover_tries)
|
|
|
|
def connect_volume(self, connection_info, instance):
|
|
|
|
device_info = self.connector.connect_volume(
|
|
connection_info['data'])
|
|
LOG.debug("Connecting NVMe volume with device_info %s",
|
|
device_info, instance=instance)
|
|
|
|
connection_info['data']['device_path'] = device_info['path']
|
|
|
|
def disconnect_volume(self, connection_info, instance, force=False):
|
|
"""Detach the volume from the instance."""
|
|
LOG.debug("Disconnecting NVMe disk", instance=instance)
|
|
self.connector.disconnect_volume(
|
|
connection_info['data'], None, force=force)
|
|
super(LibvirtNVMEVolumeDriver,
|
|
self).disconnect_volume(connection_info, instance, force=force)
|
|
|
|
def extend_volume(self, connection_info, instance, requested_size):
|
|
"""Extend the volume."""
|
|
LOG.debug("calling os-brick to extend NVMe Volume", instance=instance)
|
|
new_size = self.connector.extend_volume(connection_info['data'])
|
|
LOG.debug("Extend NVMe Volume %s; new_size=%s",
|
|
connection_info['data']['device_path'],
|
|
new_size, instance=instance)
|
|
return new_size
|