{'vol_name': vol_name,
'vol_size': vol_size}) # OKAY
+- Use 'raise' instead of 'raise e' to preserve original traceback or exception being reraised::
+
+ except Exception as e:
+ ...
+ raise e # BAD
+
+ except Exception:
+ ...
+ raise # OKAY
Imports
-------
"""
+import sys
+
from oslo.config import cfg
import webob.exc
try:
message = self.message % kwargs
- except Exception as e:
+ except Exception:
+ exc_info = sys.exc_info()
# kwargs doesn't match a variable in the message
# log the issue and the kwargs
LOG.exception(_('Exception in string format operation'))
for name, value in kwargs.iteritems():
LOG.error("%s: %s" % (name, value))
if CONF.fatal_exception_format_errors:
- raise e
- else:
- # at least get the core message out if something happened
- message = self.message
+ raise exc_info[0], exc_info[1], exc_info[2]
+ # at least get the core message out if something happened
+ message = self.message
super(CinderException, self).__init__(message)
if isinstance(e, api.NaApiError):
pass
else:
- raise e
+ raise
mox.VerifyAll()
os.makedirs(path)
except OSError as e:
if e.errno != errno.EEXIST:
- raise e
+ raise
def _create_fake_config(self):
open(self.TEST_CONFIG, "w+").close()
os.unlink(self.TEST_CONFIG)
except OSError as e:
if e.errno != errno.ENOENT:
- raise e
+ raise
def _configure_driver(self):
scality.CONF.scality_sofs_config = self.TEST_CONFIG
Tests for the IBM Storwize family and SVC volume driver.
"""
+
import random
import re
import socket
self.assertEqual(attrs[k], v)
except exception.ProcessExecutionError as e:
if 'CMMVC7050E' not in e.stderr:
- raise e
+ raise
def test_storwize_svc_unicode_host_and_volume_names(self):
# We'll check with iSCSI only - nothing protocol-dependednt here
from cinder.db import base
from cinder import exception
+from cinder.openstack.common import excutils
from cinder.openstack.common import log as logging
from cinder import quota
from cinder.volume import api as volume_api
if donor_reservations:
QUOTAS.commit(context, donor_reservations, project_id=donor_id)
LOG.info(_("Volume %s has been transferred.") % volume_id)
- except Exception as exc:
- QUOTAS.rollback(context, reservations)
- if donor_reservations:
- QUOTAS.rollback(context, donor_reservations,
- project_id=donor_id)
- raise exc
+ except Exception:
+ with excutils.save_and_reraise_exception():
+ QUOTAS.rollback(context, reservations)
+ if donor_reservations:
+ QUOTAS.rollback(context, donor_reservations,
+ project_id=donor_id)
vol_ref = self.db.volume_get(context, volume_id)
return {'id': transfer_id,
from xml.etree import ElementTree as ETree
from cinder import exception
+from cinder.openstack.common import excutils
from cinder.openstack.common import log as logging
from cinder import utils
from cinder.volume import driver
return None
except ETree.ParseError as e:
if check:
- LOG.error(_("XML exception reading parameter: %s") % element)
- raise e
+ with excutils.save_and_reraise_exception():
+ LOG.error(_("XML exception reading parameter: %s") % element)
else:
LOG.info(_("XML exception reading parameter: %s") % element)
return None
storage systems with installed iSCSI licenses.
"""
+import sys
import time
import uuid
message = e.message
msg = _('Error mapping lun. Code :%(code)s, Message:%(message)s')
msg_fmt = {'code': code, 'message': message}
+ exc_info = sys.exc_info()
LOG.warn(msg % msg_fmt)
(igroup, lun_id) = self._find_mapped_lun_igroup(path, initiator)
if lun_id is not None:
return lun_id
else:
- raise e
+ raise exc_info[0], exc_info[1], exc_info[2]
def _unmap_lun(self, path, initiator):
"""Unmaps a lun from given initiator."""
msg = _("Error unmapping lun. Code :%(code)s,"
" Message:%(message)s")
msg_fmt = {'code': e.code, 'message': e.message}
+ exc_info = sys.exc_info()
LOG.warn(msg % msg_fmt)
# if the lun is already unmapped
if e.code == '13115' or e.code == '9016':
pass
else:
- raise e
+ raise exc_info[0], exc_info[1], exc_info[2]
def _find_mapped_lun_igroup(self, path, initiator, os=None):
"""Find the igroup for mapped lun with initiator."""
except NaApiError as e:
if e.code != 'UnknownCloneId':
self._clear_clone(clone_id)
- raise e
+ raise
def _get_actual_path_for_export(self, export_path):
"""Gets the actual path on the filer for export path."""
for credentials to talk to the REST service on the 3PAR
array.
"""
+
+
import base64
import json
import paramiko
from cinder import context
from cinder import exception
+from cinder.openstack.common import excutils
from cinder.openstack.common import log as logging
from cinder import utils
from cinder.volume import volume_types
+
LOG = logging.getLogger(__name__)
hp3par_opts = [
"attempts : '%(command)s'") %
{'total_attempts': total_attempts, 'command': command})
raise paramiko.SSHException(msg)
- except Exception as e:
- LOG.error(_("Error running ssh command: %s") % command)
- raise e
+ except Exception:
+ with excutils.save_and_reraise_exception():
+ LOG.error(_("Error running ssh command: %s") % command)
def _delete_3par_host(self, hostname):
self._cli_run('removehost %s' % hostname, None)
from oslo.config import cfg
from cinder import exception
+from cinder.openstack.common import excutils
from cinder.openstack.common import log as logging
from cinder import utils
from cinder.volume.driver import ISCSIDriver
stderr="Error running SSH command",
cmd=command)
- except Exception as e:
- LOG.error(_("Error running SSH command: %s") % command)
- raise e
+ except Exception:
+ with excutils.save_and_reraise_exception():
+ LOG.error(_("Error running SSH command: %s") % command)
def ensure_export(self, context, volume):
"""Synchronously recreates an export for a logical volume."""
Scality SOFS Volume Driver.
"""
+
import errno
import os
import urllib2
from cinder.openstack.common import log as logging
from cinder.volume import driver
+
LOG = logging.getLogger(__name__)
volume_opts = [
os.makedirs(path)
except OSError as e:
if e.errno != errno.EEXIST:
- raise e
+ raise
def _mount_sofs(self):
config = CONF.scality_sofs_config
Code Review / openstack-build / cinder-build.git / commitdiff