Change in vdsm[ovirt-3.5]: restore_nets: during rollback, ignore removal of a missing bond

ybronhei at redhat.com ybronhei at redhat.com
Mon Mar 9 12:05:40 UTC 2015


Yaniv Bronhaim has submitted this change and it was merged.

Change subject: restore_nets: during rollback, ignore removal of a missing bond
......................................................................


restore_nets: during rollback, ignore removal of a missing bond

If a bond is removed outside vdsm, attempting to restore networks to the
last known-good set of configuration currently fails.

With this patch, if vdsm is asked to remove an already-missing bond
device during an attempt to restore networking, this descripency is
ignored, and restore_nets would go on attempting to restore further
networks, hopefully restoring connectivity to the host.

The accompanying test verifies that restore_nets survive after such
removal. It also verifies that adding a network on top of an
already-existing bond ends with the bonding device being consumed into
the running (and later, persistent) config.

Change-Id: I7b863ffd829026f9ea3030ac77e57cf6521fe6ba
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/38211
Bug-Url: https://bugzilla.redhat.com/1196271
Reviewed-on: https://gerrit.ovirt.org/38312
Reviewed-by: Petr Horáček <phoracek at redhat.com>
Tested-by: Petr Horáček <phoracek at redhat.com>
Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M tests/functional/networkTests.py
M vdsm/network/api.py
2 files changed, 49 insertions(+), 8 deletions(-)

Approvals:
  Yaniv Bronhaim: Looks good to me, approved
  Petr Horáček: Verified; Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b863ffd829026f9ea3030ac77e57cf6521fe6ba
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list