Change in vdsm[master]: Avoid redundant check for volume create rollback.

Eduardo has uploaded a new change for review.

Change subject: Avoid redundant check for volume create rollback.
......................................................................

Avoid redundant check for volume create rollback.

The same check will be called during volume delete.
In addition removing createVolumeRollbackError, code 228.

Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Related-to: BZ#960952
Signed-off-by: Eduardo <ewarszaw(a)redhat.com&gt;
---
M vdsm/storage/storage_exception.py
M vdsm/storage/volume.py
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/15764/1

diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py
index ed2566b..92cf9b8 100644
--- a/vdsm/storage/storage_exception.py
+++ b/vdsm/storage/storage_exception.py
@@ -304,9 +304,9 @@
     message = "Cannot prepare illegal volume"
 
 
-class createVolumeRollbackError(StorageException):
-    code = 228
-    message = "Failure create volume rollback"
+# class createVolumeRollbackError(StorageException):
+#     code = 228
+#     message = "Failure create volume rollback"
 
 
 class createVolumeSizeError(StorageException):
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 36e8d30..1c81d87 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -371,9 +371,6 @@
                      "volUUID=%s imageDir=%s" %
                      (repoPath, sdUUID, imgUUID, volUUID, imageDir))
         vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID)
-        # Avoid rollback if volume has children
-        if len(vol.getChildrenList()):
-            raise se.createVolumeRollbackError(volUUID)
         pvol = vol.getParentVolume()
         # Remove volume
         vol.delete(postZero=False, force=True)


-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 3:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/3882/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3799/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/2993/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Ayal Baron has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 2: Looks good to me, approved

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 2: Looks good to me, approved

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 2: Looks good to me, but someone else must approve

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 2:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2871/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/2060/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2949/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 1: Fails

Build Failed 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/2790/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/1978/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/2864/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Avoid redundant check for volume create rollback.

The same check will be called during volume delete.
In addition removing createVolumeRollbackError, code 228.

Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Related-to: BZ#960952
Signed-off-by: Eduardo <ewarszaw(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/15764
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Tested-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/storage/storage_exception.py
M vdsm/storage/volume.py
2 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Gadi Ickowicz <gickowic(a)redhat.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Avoid redundant check for volume create rollback.
......................................................................


Patch Set 3: Verified+1 Code-Review+2

Verified by Edu with http://gerrit.ovirt.org/#/c/15766/
Copying Ayal's +2.

-- 
To view, visit http://gerrit.ovirt.org/15764
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I77e9a1e6c38cbd35f99aecf1422d874fff21449b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Elad Ben Aharon <eladba1990(a)gmail.com&gt;
Gerrit-Reviewer: Gadi Ickowicz <gickowic(a)redhat.com&gt;
Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No