Change in vdsm[ovirt-3.5]: net config: make sure ifcfg files are not persisted on node

[Dan Kenigsberg]

Hello Douglas Schilling Landgraf,

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

http://gerrit.ovirt.org/37016

to review the following change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

net config: make sure ifcfg files are not persisted on node

When setting up networking, a multitude of ifcfg files may be modified.
If we are using the (default) 'unified' persistence mode, we expect that
none of these modification is to be persisted for the next boot.

However already-persisted ifcfg files would; unpersisted files won't,
which lead to the inconsistent state reported in the bug.

In this patch we make sure that none of our changes to ifcfg files is to
be persisted.

Change-Id: Ia61b2385ce0bf44a67f627caf5b73b68992349fd
Bug-Url: https://bugzilla.redhat.com/1165203
Signed-off-by: Dan Kenigsberg 
Reviewed-on: http://gerrit.ovirt.org/36985
Reviewed-by: Douglas Schilling Landgraf 
Tested-by: Douglas Schilling Landgraf 
---
M vdsm/network/configurators/ifcfg.py
1 file changed, 5 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/37016/1

diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py
index 5dbe9c1..87fd849 100644
--- a/vdsm/network/configurators/ifcfg.py
+++ b/vdsm/network/configurators/ifcfg.py
@@ -534,6 +534,11 @@
         writes the new configuration and sets the specified access mode.'''
         self._backup(fileName)
         configuration = self.CONFFILE_HEADER + '\n' + configuration
+
+        # make sure that ifcfg files are never persisted by the node
+        if self.unifiedPersistence and utils.isOvirtNode():
+            node_fs.Config().unpersist(fileName)
+
         logging.debug('Writing to file %s configuration:\n%s', fileName,
                       configuration)
         with open(fileName, 'w') as confFile:

[e-mail] has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 1:

* Update tracker::#1165203::OK
* Check Bug-Url::OK
* Check Public Bug::#1165203::OK, public bug
* Check Product::#1165203::OK, Correct product Red Hat Enterprise Virtualization Manager
* Check TR::#1165203::OK, correct target release 3.5.0
* Check merged to previous::OK, change not open on any previous branch

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 1:

Build Failed

http://jenkins.ovirt.org/job/vdsm_3.5_network_functional_tests_gerrit/31/ : There was an infra issue, please contact [e-mail]

Yaniv Bronhaim has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 1: Code-Review+2

Yaniv Bronhaim has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 1: Verified+1

same as master and based on douglas verification on master

Yaniv Bronhaim has submitted this change and it was merged.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

net config: make sure ifcfg files are not persisted on node

When setting up networking, a multitude of ifcfg files may be modified.
If we are using the (default) 'unified' persistence mode, we expect that
none of these modification is to be persisted for the next boot.

However already-persisted ifcfg files would; unpersisted files won't,
which lead to the inconsistent state reported in the bug.

In this patch we make sure that none of our changes to ifcfg files is to
be persisted.

Change-Id: Ia61b2385ce0bf44a67f627caf5b73b68992349fd
Bug-Url: https://bugzilla.redhat.com/1165203
Signed-off-by: Dan Kenigsberg 
Reviewed-on: http://gerrit.ovirt.org/36985
Reviewed-by: Douglas Schilling Landgraf 
Tested-by: Douglas Schilling Landgraf 
Reviewed-on: http://gerrit.ovirt.org/37016
Reviewed-by: Yaniv Bronhaim 
Tested-by: Yaniv Bronhaim 
---
M vdsm/network/configurators/ifcfg.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Yaniv Bronhaim: Verified; Looks good to me, approved

[e-mail] has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 2:

* Update tracker::#1165203::OK
* Set MODIFIED::bug 1165203::::#1165203::::IGNORE, not oVirt prod but Red Hat Enterprise Virtualization Manager

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: net config: make sure ifcfg files are not persisted on node
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-el6-x86_64_merged/157/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-el7-x86_64_merged/154/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-fc20-x86_64_merged/154/ : SUCCESS