Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 3:

* #1234867::Update tracker: OK
* Set MODIFIED::bug 1234867#1234867IGNORE, not all related patches are 
closed, check 49694

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread danken 
Dan Kenigsberg has submitted this change and it was merged.

Change subject: hooks: ovs: better rollback
..


hooks: ovs: better rollback

Until now, OVS hook was not able to rollback after failed
setup of non-OVS networks.

Now it uses after_network_setup and after_network_setup_fail
hook points to handle general rollback for all failures
(both OVS and non-OVS).

Before OVS setup we save initial OVS configuration to a temporary
file via pickle. If an exception occurs during setupNetworks,
API.py does the standard rollback. Then after_network_setup_fail
is executed and runs setupNetworks with a special option _inOVSRollback
which triggers OVS-only rollback. OVS-only rollback removes all
OVS networks and recreates them according to configuration saved in
the temprorary file. When everything is done, temporary file is
removed.

Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/46907
Continuous-Integration: Jenkins CI
Reviewed-by: Ido Barkan 
Reviewed-by: Dan Kenigsberg 
Bug-Url: https://bugzilla.redhat.com/1234867
Reviewed-on: https://gerrit.ovirt.org/49693
Reviewed-by: Francesco Romani 
Continuous-Integration: Dan Kenigsberg 
---
M debian/vdsm-hook-ovs.install
M vdsm.spec.in
M vdsm_hooks/ovs/Makefile.am
M vdsm_hooks/ovs/README
A vdsm_hooks/ovs/ovs_after_network_setup.py
A vdsm_hooks/ovs/ovs_after_network_setup_fail.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_utils.py
8 files changed, 243 insertions(+), 94 deletions(-)

Approvals:
  Ido Barkan: Looks good to me, but someone else must approve
  Petr Horáček: Verified
  Dan Kenigsberg: Passed CI tests
  Francesco Romani: Looks good to me, approved

Objections:
  Jenkins CI: Failed CI tests



-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2: Continuous-Integration+1

Unrelated error

 11:59:44 ERROR: testSymlinkMount (mountTests.MountTests)
11:59:44 --
11:59:44 Traceback (most recent call last):
11:59:44   File 
"/home/jenkins/workspace/vdsm_3.6_check-patch-fc23-x86_64/vdsm/tests/mountTests.py",
 line 150, in testSymlinkMount
11:59:44 m.mount(mntOpts="loop")
11:59:44   File 
"/home/jenkins/workspace/vdsm_3.6_check-patch-fc23-x86_64/vdsm/vdsm/storage/mount.py",
 line 225, in mount
11:59:44 return self._runcmd(cmd, timeout)
11:59:44   File 
"/home/jenkins/workspace/vdsm_3.6_check-patch-fc23-x86_64/vdsm/vdsm/storage/mount.py",
 line 241, in _runcmd
11:59:44 raise MountError(rc, ";".join((out, err)))
11:59:44 MountError: (32, ';mount: /var/tmp/tmp_U8agE/backing.img: failed to 
setup loop device: No such file or directory\n')

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2:

Rerun-Hooks: all

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2:

* #1234867::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1234867::OK, public bug
* Check Product::#1234867::OK, Correct classification oVirt
* Check TM::#1234867::OK, correct target milestone ovirt-3.6.3
* Check merged to previous::OK, change not open on any previous branch

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-14 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2:

waiting for another jenkins run

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-06 Thread ibarkan 
Ido Barkan has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-04 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2:

* #1234867::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1234867::OK, public bug
* Check Product::#1234867::OK, Correct classification oVirt
* Check TM::#1234867::OK, correct target milestone ovirt-3.6.3
* Check merged to previous::OK, change not open on any previous branch

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-04 Thread phoracek 
Petr Horáček has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 2: Verified+1

passed ovs tests without a regression, testSetupNetworksConnectivityCheck 
passes now

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-03 Thread phoracek 
Hello Ido Barkan, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

https://gerrit.ovirt.org/49693

to review the following change.

Change subject: hooks: ovs: better rollback
..

hooks: ovs: better rollback

Until now, OVS hook was not able to rollback after failed
setup of non-OVS networks.

Now it uses after_network_setup and after_network_setup_fail
hook points to handle general rollback for all failures
(both OVS and non-OVS).

Before OVS setup we save initial OVS configuration to a temporary
file via pickle. If an exception occurs during setupNetworks,
API.py does the standard rollback. Then after_network_setup_fail
is executed and runs setupNetworks with a special option _inOVSRollback
which triggers OVS-only rollback. OVS-only rollback removes all
OVS networks and recreates them according to configuration saved in
the temprorary file. When everything is done, temporary file is
removed.

Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/46907
Continuous-Integration: Jenkins CI
Reviewed-by: Ido Barkan 
Reviewed-by: Dan Kenigsberg 
Bug-Url: https://bugzilla.redhat.com/1234867
---
M debian/vdsm-hook-ovs.install
M vdsm.spec.in
M vdsm_hooks/ovs/Makefile.am
M vdsm_hooks/ovs/README
A vdsm_hooks/ovs/ovs_after_network_setup.py
A vdsm_hooks/ovs/ovs_after_network_setup_fail.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_utils.py
8 files changed, 240 insertions(+), 94 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/49693/1

diff --git a/debian/vdsm-hook-ovs.install b/debian/vdsm-hook-ovs.install
index 0154da5..4c99806 100644
--- a/debian/vdsm-hook-ovs.install
+++ b/debian/vdsm-hook-ovs.install
@@ -11,3 +11,7 @@
 usr/libexec/vdsm/hooks/before_device_create/ovs_utils.py
 usr/libexec/vdsm/hooks/before_network_setup/50_ovs
 usr/libexec/vdsm/hooks/before_network_setup/ovs_utils.py
+usr/libexec/vdsm/hooks/after_network_setup/50_ovs
+usr/libexec/vdsm/hooks/after_network_setup/ovs_utils.py
+usr/libexec/vdsm/hooks/after_network_setup_fail/50_ovs
+usr/libexec/vdsm/hooks/after_network_setup_fail/ovs_utils.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index c9dc715..99f5f00 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1212,6 +1212,10 @@
 %{_libexecdir}/%{vdsm_name}/hooks/before_network_setup/ovs_setup_mtu.py*
 %{_libexecdir}/%{vdsm_name}/hooks/before_network_setup/ovs_setup_ovs.py*
 %{_libexecdir}/%{vdsm_name}/hooks/before_network_setup/ovs_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/50_ovs
+%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/ovs_utils.py*
+%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup_fail/50_ovs
+%{_libexecdir}/%{vdsm_name}/hooks/after_network_setup_fail/ovs_utils.py*
 
 %files hook-macspoof
 %defattr(-, root, root, -)
diff --git a/vdsm_hooks/ovs/Makefile.am b/vdsm_hooks/ovs/Makefile.am
index 879b68b..a539039 100644
--- a/vdsm_hooks/ovs/Makefile.am
+++ b/vdsm_hooks/ovs/Makefile.am
@@ -37,6 +37,8 @@
ovs_before_network_setup_ip.py \
ovs_before_network_setup_mtu.py \
ovs_before_network_setup_libvirt.py \
+   ovs_after_network_setup.py \
+   ovs_after_network_setup_fail.py \
$(utilsfile) \
sudoers.in
 
@@ -62,6 +64,12 @@
$(DESTDIR)$(vdsmhooksdir)/before_network_setup/ovs_setup_mtu.py
$(INSTALL_SCRIPT) $(srcdir)/ovs_before_network_setup_libvirt.py \

$(DESTDIR)$(vdsmhooksdir)/before_network_setup/ovs_setup_libvirt.py
+   $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_network_setup
+   $(INSTALL_SCRIPT) $(srcdir)/ovs_after_network_setup.py \
+   $(DESTDIR)$(vdsmhooksdir)/after_network_setup/50_ovs
+   $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_network_setup_fail
+   $(INSTALL_SCRIPT) $(srcdir)/ovs_after_network_setup_fail.py \
+   $(DESTDIR)$(vdsmhooksdir)/after_network_setup_fail/50_ovs
 
 uninstall-local: uninstall-data-utils uninstall-data-sudoers
$(RM) $(DESTDIR)$(vdsmhooksdir)/after_get_caps/50_ovs
@@ -72,6 +80,8 @@
$(RM) $(DESTDIR)$(vdsmhooksdir)/before_network_setup/ovs_setup_ip.py
$(RM) $(DESTDIR)$(vdsmhooksdir)/before_network_setup/ovs_setup_mtu.py
$(RM) 
$(DESTDIR)$(vdsmhooksdir)/before_network_setup/ovs_setup_libvirt.py
+   $(RM) $(DESTDIR)$(vdsmhooksdir)/after_network_setup/50_ovs
+   $(RM) $(DESTDIR)$(vdsmhooksdir)/after_network_setup_fail/50_ovs
 
 install-data-utils:
$(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_get_caps
@@ -86,12 +96,20 @@
$(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_network_setup
$(INSTALL_SCRIPT) $(srcdir)/$(utilsfile) \
$(DESTDIR)$(vdsmhooksdir)/before_network_setup/$(utilsfile)
+   $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_network_setup
+   $(INSTALL_SCRIPT)

Change in vdsm[ovirt-3.6]: hooks: ovs: better rollback

2015-12-03 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: hooks: ovs: better rollback
..


Patch Set 1:

* #1234867::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1234867::OK, public bug
* Check Product::#1234867::OK, Correct classification oVirt
* Check TM::#1234867::OK, correct target milestone ovirt-3.6.3
* Check merged to previous::OK, change not open on any previous branch

-- 
To view, visit https://gerrit.ovirt.org/49693
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches