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 <phora...@redhat.com> Reviewed-on: https://gerrit.ovirt.org/46907 Continuous-Integration: Jenkins CI Reviewed-by: Ido Barkan <ibar...@redhat.com> Reviewed-by: Dan Kenigsberg <dan...@redhat.com> --- 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(-) Approvals: Ido Barkan: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Petr Horáček: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/46907 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f6b63d03bb9579e260bfad1686047a431f69543 Gerrit-PatchSet: 18 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phora...@redhat.com> Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Ido Barkan <ibar...@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda <osvob...@redhat.com> Gerrit-Reviewer: Petr Horáček <phora...@redhat.com> Gerrit-Reviewer: gerrit-hooks <automat...@ovirt.org> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches