Change in vdsm[master]: net: only backup ifcfg files if they are not already persisted.

danken at redhat.com danken at redhat.com
Thu Jul 16 11:43:21 UTC 2015


Dan Kenigsberg has submitted this change and it was merged.

Change subject: net: only backup ifcfg files if they are not already persisted.
......................................................................


net: only backup ifcfg files if they are not already persisted.

d6454e introduced backing up of ifcfg files that were not owned by
vdsm before the current call. Now, after selective restoration was
introduced, when a network is restored because it is different
from it's persistence, it is edited. This is done by removing it
(and it's ifcfg files) an re-add it. The result is that ifcfgs get
backed up also because they were just deleted by the current call,
and are now re-added. We end up with file placeholders that make vdsm
ifdown them during restoration. This defeats the whole selective
restoration feature.
In order to preserve the original meaning of _backup, we now
compute all the possible ifcfg files that are part of unified
persistence and backup only the ones that are not.

Change-Id: I8d99efb8141cf7c6409050170c24714899c64be9
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
Bug-Url: https://bugzilla.redhat.com/1203422
Reviewed-on: https://gerrit.ovirt.org/43684
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/functional/networkTests.py
M vdsm/network/configurators/ifcfg.py
2 files changed, 94 insertions(+), 21 deletions(-)

Approvals:
  Ido Barkan: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d99efb8141cf7c6409050170c24714899c64be9
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation at ovirt.org


More information about the vdsm-patches mailing list