openstack
/
cinder
Code Issues Proposed changes

Merge "Storwize: Multiple management IP not raising exceptions"

This commit is contained in:
Jenkins 2016-04-21 16:40:10 +00:00 committed by Gerrit Code Review
parent dfcea15f61 29bc11821b
commit a444c81a3a
2 changed files with 91 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cinder/tests/unit/test_storwize_svc.py
View File

@ -2687,11 +2687,6 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
super(StorwizeSVCCommonDriverTestCase, self).setUp()
self.USESIM = True
if self.USESIM:
self.driver = StorwizeSVCISCSIFakeDriver(
configuration=conf.Configuration(None))
self._driver = storwize_svc_iscsi.StorwizeSVCISCSIDriver(
configuration=conf.Configuration(None))
self._def_flags = {'san_ip': 'hostname',
'storwize_san_secondary_ip': 'secondaryname',
'san_login': 'user',
@ -2701,6 +2696,13 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
'storwize_svc_flashcopy_timeout': 20,
'storwize_svc_flashcopy_rate': 49,
'storwize_svc_allow_tenant_qos': True}
config = conf.Configuration(None)
# Override any configs that may get set in __init__
self._reset_flags(config)
self.driver = StorwizeSVCISCSIFakeDriver(
configuration=config)
self._driver = storwize_svc_iscsi.StorwizeSVCISCSIDriver(
configuration=config)
wwpns = [
six.text_type(random.randint(0, 9999999999999999)).zfill(16),
six.text_type(random.randint(0, 9999999999999999)).zfill(16)]
@ -2715,7 +2717,8 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
self.driver.set_fake_storage(self.sim)
self.ctxt = context.get_admin_context()
self._reset_flags()
else:
self._reset_flags()
self.ctxt = context.get_admin_context()
db_driver = self.driver.configuration.db_driver
self.db = importutils.import_module(db_driver)
@ -2724,14 +2727,18 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
self.driver.check_for_setup_error()
self.driver._helpers.check_fcmapping_interval = 0
def _set_flag(self, flag, value):
group = self.driver.configuration.config_group
self.driver.configuration.set_override(flag, value, group)
def _set_flag(self, flag, value, configuration=None):
if not configuration:
configuration = self.driver.configuration
group = configuration.config_group
configuration.set_override(flag, value, group)
def _reset_flags(self):
self.driver.configuration.local_conf.reset()
def _reset_flags(self, configuration=None):
if not configuration:
configuration = self.driver.configuration
configuration.local_conf.reset()
for k, v in self._def_flags.items():
self._set_flag(k, v)
self._set_flag(k, v, configuration)
def _assert_vol_exists(self, name, exists):
is_vol_defined = self.driver._helpers.is_vdisk_defined(name)
@ -2885,6 +2892,49 @@ class StorwizeSVCCommonDriverTestCase(test.TestCase):
min_size=self._driver.configuration.ssh_min_pool_conn,
max_size=self._driver.configuration.ssh_max_pool_conn)
@mock.patch.object(ssh_utils, 'SSHPool')
@mock.patch.object(processutils, 'ssh_execute')
def test_run_ssh_both_ip_set_failure(self, mock_ssh_execute,
mock_ssh_pool):
mock_ssh_pool.side_effect = [
paramiko.SSHException,
mock.MagicMock(),
mock.MagicMock()]
mock_ssh_execute.side_effect = [processutils.ProcessExecutionError,
processutils.ProcessExecutionError]
ssh_cmd = ['svcinfo']
self.assertRaises(processutils.ProcessExecutionError,
self._driver._run_ssh, ssh_cmd)
@mock.patch.object(ssh_utils, 'SSHPool')
@mock.patch.object(processutils, 'ssh_execute')
def test_run_ssh_second_ip_not_set_failure(self, mock_ssh_execute,
mock_ssh_pool):
mock_ssh_execute.side_effect = [processutils.ProcessExecutionError,
mock.MagicMock()]
self._set_flag('storwize_san_secondary_ip', None)
ssh_cmd = ['svcinfo']
self.assertRaises(processutils.ProcessExecutionError,
self._driver._run_ssh, ssh_cmd)
@mock.patch.object(random, 'randint', mock.Mock(return_value=0))
@mock.patch.object(ssh_utils, 'SSHPool')
@mock.patch.object(processutils, 'ssh_execute')
def test_run_ssh_consistent_active_ip(self, mock_ssh_execute,
mock_ssh_pool):
ssh_cmd = ['svcinfo']
self._driver._run_ssh(ssh_cmd)
self._driver._run_ssh(ssh_cmd)
self._driver._run_ssh(ssh_cmd)
self.assertEqual(self._driver.configuration.san_ip,
self._driver.active_ip)
mock_ssh_execute.side_effect = [paramiko.SSHException,
mock.MagicMock(), mock.MagicMock()]
self._driver._run_ssh(ssh_cmd)
self._driver._run_ssh(ssh_cmd)
self.assertEqual(self._driver.configuration.storwize_san_secondary_ip,
self._driver.active_ip)
def _generate_vol_info(self, vol_name, vol_id):
pool = _get_test_pool()
rand_id = six.text_type(random.randint(10000, 99999))

55
cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
View File

@ -1857,6 +1857,8 @@ class StorwizeSVCCommonDriver(san.SanDriver,
super(StorwizeSVCCommonDriver, self).__init__(*args, **kwargs)
self.configuration.append_config_values(storwize_svc_opts)
self._backend_name = self.configuration.safe_get('volume_backend_name')
self.active_ip = self.configuration.san_ip
self.inactive_ip = self.configuration.storwize_san_secondary_ip
self._helpers = StorwizeHelpers(self._run_ssh)
self._vdiskcopyops = {}
self._vdiskcopyops_loop = None
@ -2022,14 +2024,13 @@ class StorwizeSVCCommonDriver(san.SanDriver,
command = ' '.join(cmd_list)
if not self.sshpool:
try:
self.sshpool = self._set_up_sshpool(self.configuration.san_ip)
self.sshpool = self._set_up_sshpool(self.active_ip)
except paramiko.SSHException:
LOG.warning(_LW('Unable to use san_ip to create SSHPool. Now '
'attempting to use storwize_san_secondary_ip '
'to create SSHPool.'))
if self.configuration.storwize_san_secondary_ip is not None:
self.sshpool = self._set_up_sshpool(
self.configuration.storwize_san_secondary_ip)
if self._toggle_ip():
self.sshpool = self._set_up_sshpool(self.active_ip)
else:
LOG.warning(_LW('Unable to create SSHPool using san_ip '
'and not able to use '
@ -2043,32 +2044,22 @@ class StorwizeSVCCommonDriver(san.SanDriver,
except Exception:
# Need to check if creating an SSHPool storwize_san_secondary_ip
# before raising an error.
if self.configuration.storwize_san_secondary_ip is not None:
if (self.sshpool.ip ==
self.configuration.storwize_san_secondary_ip):
try:
if self._toggle_ip():
LOG.warning(_LW("Unable to execute SSH command with "
"storwize_san_secondary_ip. "
"Attempting to switch IP back "
"to san_ip %s."),
self.configuration.san_ip)
self.sshpool = self._set_up_sshpool(
self.configuration.san_ip)
"%(inactive)s. Attempting to execute SSH "
"command with %(active)s."),
{'inactive': self.inactive_ip,
'active': self.active_ip})
self.sshpool = self._set_up_sshpool(self.active_ip)
return self._ssh_execute(self.sshpool, command,
check_exit_code, attempts)
else:
LOG.warning(_LW("Unable to execute SSH command. "
"Attempting to switch IP to %s."),
self.configuration.storwize_san_secondary_ip)
self.sshpool = self._set_up_sshpool(
self.configuration.storwize_san_secondary_ip)
return self._ssh_execute(self.sshpool, command,
check_exit_code, attempts)
else:
LOG.warning(_LW('Unable to execute SSH command. '
'Not able to use '
'storwize_san_secondary_ip since it is '
'not configured.'))
LOG.warning(_LW('Not able to use '
'storwize_san_secondary_ip since it is '
'not configured.'))
raise
except Exception:
with excutils.save_and_reraise_exception():
LOG.error(_LE("Error running SSH command: %s"),
command)
@ -2122,6 +2113,18 @@ class StorwizeSVCCommonDriver(san.SanDriver,
with excutils.save_and_reraise_exception():
LOG.error(_LE("Error running SSH command: %s"), command)
def _toggle_ip(self):
# Change active_ip if storwize_san_secondary_ip is set.
if self.configuration.storwize_san_secondary_ip is None:
return False
self.inactive_ip, self.active_ip = self.active_ip, self.inactive_ip
LOG.info(_LI('Toggle active_ip from %(old)s to '
'%(new)s.'),
{'old': self.inactive_ip,
'new': self.active_ip})
return True
def ensure_export(self, ctxt, volume):
"""Check that the volume exists on the storage.