Shu Ming has uploaded a new change for review.
Change subject: Misc storage exception class name style ......................................................................
Misc storage exception class name style
All the misc storage exception class name should be prefixed with "Misc"
Change-Id: I2f6f279d13b92bbb8f573a0d772d7504860bbbe3 Signed-off-by: Shu Ming shuming@linux.vnet.ibm.com --- M vdsm/storage/sp.py M vdsm/storage/storage_exception.py 2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/8847/1
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 4aa63c0..7622556 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -220,7 +220,7 @@ .. note:: if the SPM is already started the function will fail silently.
- :raises: :exc:`storage_exception.OperationInProgress` if called during an already running connection attempt. + :raises: :exc:`storage_exception.MiscOperationInProgress` if called during an already running connection attempt. (makes the fact that it fails silently does not matter very much). """ with self.lock: @@ -228,7 +228,7 @@ return True # Since we added the lock the following should NEVER happen if self.spmRole == SPM_CONTEND: - raise se.OperationInProgress("spm start %s" % self.spUUID) + raise se.MiscOperationInProgress("spm start %s" % self.spUUID)
self.updateMonitoringThreads() self.invalidateMetadata() @@ -1934,7 +1934,7 @@ self.log.error("TODO: Implement") self._maxHostID self.spmMailer.setMaxHostID(maxID) - raise se.NotImplementedException + raise se.MiscNotImplementedException
def detachAllDomains(self): diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py index 54e64e6..a25a588 100644 --- a/vdsm/storage/storage_exception.py +++ b/vdsm/storage/storage_exception.py @@ -125,7 +125,7 @@ # Misc Exceptions #################################################
-class NotImplementedException(GeneralException): +class MiscNotImplementedException(GeneralException): code = 2000 message = "Method not implemented"
@@ -154,7 +154,7 @@ message = "Internal block device write failure"
-class OperationInProgress(StorageException): +class MiscOperationInProgress(StorageException): code = 2005 message = "Operation is already in progress"
-- To view, visit http://gerrit.ovirt.org/8847 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I2f6f279d13b92bbb8f573a0d772d7504860bbbe3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shu Ming shuming@linux.vnet.ibm.com
Shu Ming has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 1: Verified
-- To view, visit http://gerrit.ovirt.org/8847 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I2f6f279d13b92bbb8f573a0d772d7504860bbbe3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shu Ming shuming@linux.vnet.ibm.com Gerrit-Reviewer: Ayal Baron abaron@redhat.com Gerrit-Reviewer: Shu Ming shuming@linux.vnet.ibm.com
Itamar Heim has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 1:
still relevant or should be abandoned?
Federico Simoncelli has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 1: Code-Review+1
Ok. But it should be rebased and verified (checking that there are no other new usages of these exceptions).
Dan Kenigsberg has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 1: Code-Review-1
This cannot be merged without a manual rebase.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 2: Code-Review-1
Build Unstable
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4900/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5700/ : UNSTABLE
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5788/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
oVirt Jenkins CI Server has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4902/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5702/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5791/ : To avoid overloading the infrastructure, a whitelist for running gerrit triggered jobs has been set in place, if you feel like you should be in it, please contact infra at ovirt dot org.
Dan Kenigsberg has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3: Code-Review+2
All 6 occurrences changed.
Itamar Heim has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3:
ping
Itamar Heim has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3:
ping
Adam Litke has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3: Verified+1
I am willing to mark this "Verified by inspection". I did a grep through the sources and there are no unconverted names. The code also built fine for me.
Adam Litke has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 3: Code-Review+1
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Misc storage exception class name style ......................................................................
Misc storage exception class name style
All the misc storage exception class name should be prefixed with "Misc"
Change-Id: I2f6f279d13b92bbb8f573a0d772d7504860bbbe3 Signed-off-by: Shu Ming shuming@linux.vnet.ibm.com Reviewed-on: http://gerrit.ovirt.org/8847 Reviewed-by: Dan Kenigsberg danken@redhat.com Tested-by: Adam Litke alitke@redhat.com Reviewed-by: Adam Litke alitke@redhat.com --- M vdsm/storage/image.py M vdsm/storage/sp.py M vdsm/storage/storage_exception.py 3 files changed, 9 insertions(+), 8 deletions(-)
Approvals: Adam Litke: Verified; Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved
Vered Volansky has posted comments on this change.
Change subject: Misc storage exception class name style ......................................................................
Patch Set 4:
For what it's worth, verified storage functional tests -localfs and nfs only, versions 0 and 3 on RHEL 3.4 .
vdsm-patches@lists.fedorahosted.org