400ca5d6db
This patch refactors iSCSI disconnect code changing the approach to one that just uses `iscsiadm -m session` and sysfs to get all the required information: devices from the connection, multipath system device name, multipath name, the WWN for the block devices... By doing so, not only do we fix a good number of bugs, but we also improve the reliability and speed of the mechanism. A good example of improvements and benefits achieved by this patch are: - Common code for multipath and single path disconnects. - No more querying iSCSI devices for their WWN (page 0x83) removing delays and issue on flaky connections. - All devices are properly cleaned even if they are not part of the multipath. - We wait for device removal and do it in parallel if there are multiple. - Removed usage of `multipath -l` to find devices which is really slow with flaky connections and didn't work when called with a device from a path that is down. - Prevent losing data when detaching, currently if the multipath flush fails for any other reason than "in use" we silently continue with the removal. That is the case when all paths are momentarily down. - Adds a new mechanism for the caller of the disconnect to specify that it's acceptable to lose data and that it's more important to leave a clean system. That is the case if we are creating a volume from an image, since the volume will just be set to error, but we don't want leftovers. Optionally we can tell os-brick to ignore errors and don't raise an exception if the flush fails. - Add a warning when we could be leaving leftovers behind due to disconnect issues. - Action retries (like multipath flush) will now only log the final exception instead of logging all the exceptions. - Flushes of individual paths now use exponential backoff retries instead of random retries between 0.2 and 2 seconds (from oslo library). - We no longer use symlinks from `/dev/disk/by-path`, `/dev/disk/by-id`, or `/dev/mapper` to find devices or multipaths, as they could be leftovers from previous runs. - With high failure rates (above 30%) some CLI calls will enter into a weird state where they wait forever, so we add a timeout mechanism in our `execute` method and add it to those specific calls. Closes-Bug: #1502534 Change-Id: I058ff0a0e5ad517507dc3cda39087c913558561d
111 lines
3.6 KiB
Python
111 lines
3.6 KiB
Python
# All Rights Reserved.
|
|
#
|
|
# 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 os
|
|
import tempfile
|
|
|
|
from oslo_concurrency import processutils as putils
|
|
|
|
from os_brick.initiator.connectors import base
|
|
from os_brick import utils
|
|
|
|
|
|
class DRBDConnector(base.BaseLinuxConnector):
|
|
""""Connector class to attach/detach DRBD resources."""
|
|
|
|
def __init__(self, root_helper, driver=None,
|
|
execute=putils.execute, *args, **kwargs):
|
|
|
|
super(DRBDConnector, self).__init__(root_helper, driver=driver,
|
|
execute=execute, *args, **kwargs)
|
|
|
|
self._execute = execute
|
|
self._root_helper = root_helper
|
|
|
|
@staticmethod
|
|
def get_connector_properties(root_helper, *args, **kwargs):
|
|
"""The DRBD connector properties."""
|
|
return {}
|
|
|
|
def check_valid_device(self, path, run_as_root=True):
|
|
"""Verify an existing volume."""
|
|
# TODO(linbit): check via drbdsetup first, to avoid blocking/hanging
|
|
# in case of network problems?
|
|
|
|
return super(DRBDConnector, self).check_valid_device(path, run_as_root)
|
|
|
|
def get_all_available_volumes(self, connection_properties=None):
|
|
|
|
base = "/dev/"
|
|
blkdev_list = []
|
|
|
|
for e in os.listdir(base):
|
|
path = base + e
|
|
if os.path.isblk(path):
|
|
blkdev_list.append(path)
|
|
|
|
return blkdev_list
|
|
|
|
def _drbdadm_command(self, cmd, data_dict, sh_secret):
|
|
# TODO(linbit): Write that resource file to a permanent location?
|
|
tmp = tempfile.NamedTemporaryFile(suffix="res", delete=False, mode="w")
|
|
try:
|
|
kv = {'shared-secret': sh_secret}
|
|
tmp.write(data_dict['config'] % kv)
|
|
tmp.close()
|
|
|
|
(out, err) = self._execute('drbdadm', cmd,
|
|
"-c", tmp.name,
|
|
data_dict['name'],
|
|
run_as_root=True,
|
|
root_helper=self._root_helper)
|
|
finally:
|
|
os.unlink(tmp.name)
|
|
|
|
return (out, err)
|
|
|
|
@utils.trace
|
|
def connect_volume(self, connection_properties):
|
|
"""Attach the volume."""
|
|
|
|
self._drbdadm_command("adjust", connection_properties,
|
|
connection_properties['provider_auth'])
|
|
|
|
device_info = {
|
|
'type': 'block',
|
|
'path': connection_properties['device'],
|
|
}
|
|
|
|
return device_info
|
|
|
|
@utils.trace
|
|
def disconnect_volume(self, connection_properties, device_info,
|
|
force=False, ignore_errors=False):
|
|
"""Detach the volume."""
|
|
|
|
self._drbdadm_command("down", connection_properties,
|
|
connection_properties['provider_auth'])
|
|
|
|
def get_volume_paths(self, connection_properties):
|
|
path = connection_properties['device']
|
|
return [path]
|
|
|
|
def get_search_path(self):
|
|
# TODO(linbit): is it allowed to return "/dev", or is that too broad?
|
|
return None
|
|
|
|
def extend_volume(self, connection_properties):
|
|
# TODO(walter-boring): is this possible?
|
|
raise NotImplementedError
|