Change in vdsm[master]: store-net-config: persist ifcfg mgmt on node

[Dan Kenigsberg]

Dan Kenigsberg has uploaded a new change for review.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

store-net-config: persist ifcfg mgmt on node

With unified network persistence, we would like to persist only
vdsm-level definition of networks. However, as reported
https://bugzilla.redhat.com/1128140 we need to keep the management
network configured with ifcfg until we split network recovery from Vdsm.

This is true for node-based installations, too. Therefore, this patch
persists ifcfg files on the node.

Change-Id: Ia61b2385ce0bf44a67f627caf5b73b68992349fd
Bug-Url: https://bugzilla.redhat.com/116520
Signed-off-by: Dan Kenigsberg 
---
M vdsm/vdsm-store-net-config.in
1 file changed, 7 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/36985/1

diff --git a/vdsm/vdsm-store-net-config.in b/vdsm/vdsm-store-net-config.in
index 94e658b..a0e52ef 100755
--- a/vdsm/vdsm-store-net-config.in
+++ b/vdsm/vdsm-store-net-config.in
@@ -43,6 +43,13 @@
     # oVirt node ovirt_store_config puts the dir in persistent storage and
     # bind mounts it in the original place. So that's all we really need to do.
     ovirt_store_config "$PERS_CONF_PATH"
+
+    # With no ip address on boot time, libvirtd cannot start
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1165203
+    #
+    # TODO: remove when network restoration is splitted out of vdsmd
+    # http://gerrit.ovirt.org/29441/
+    ifcfg_node_persist
 }

unified_nonnode_persist() {

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

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1:

* Update tracker::#116520::OK
* Check Bug-Url::OK
* Check Public Bug::#116520::OK, public bug
* Check Product::#116520::SKIPPED, not (oVirt Red Hat Enterprise Virtualization Manager) product but Red Hat Enterprise CMS
* Check Product::WARN, no bug url with correct product found, make sure you have at least one bug-url with a product in oVirt Red Hat Enterprise Virtualization Manager.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15098/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/14929/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14141/ : FAILURE

Fabian Deutsch has posted comments on this change.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1: Code-Review+1

(1 comment)

http://gerrit.ovirt.org/#/c/36985/1/vdsm/vdsm-store-net-config.in
File vdsm/vdsm-store-net-config.in:

Line 48:     # https://bugzilla.redhat.com/show_bug.cgi?id=1165203
Line 49:     #
Line 50:     # TODO: remove when network restoration is splitted out of vdsmd
Line 51:     # http://gerrit.ovirt.org/29441/
Line 52:     ifcfg_node_persist
If we are sure that all the ifcfg files are in $NET_CONF_BACK_DIR (as used in ifcfg_node_persist), then we should be good.
Line 53: }
Line 54: 
Line 55: unified_nonnode_persist() {
Line 56:     # Atomic directory copy by using the atomicity of overwriting a link

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1:

(1 comment)

http://gerrit.ovirt.org/#/c/36985/1//COMMIT_MSG
Commit Message:

Line 14: This is true for node-based installations, too. Therefore, this patch
Line 15: persists ifcfg files on the node.
Line 16: 
Line 17: Change-Id: Ia61b2385ce0bf44a67f627caf5b73b68992349fd
Line 18: Bug-Url: https://bugzilla.redhat.com/116520
The right bz number is 1165203

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1: Code-Review-1

(3 comments)

Dan, I did few comments, didn't make the trick.

http://gerrit.ovirt.org/#/c/36985/1/vdsm/vdsm-store-net-config.in
File vdsm/vdsm-store-net-config.in:

Line 16: 
Line 17: PERSISTENCE=$1
Line 18: 
Line 19: ifcfg_node_persist() {
Line 20:     for f in "$NET_CONF_BACK_DIR"/*;
$f it will be /var/lib/vdsm/netconfback/* and will execute the continue statement below. So it won't be possible to execute ovirt_store_config. /var/lib/vdsm/netconfback is empty.
Line 21:     do
Line 22:         [ ! -f "$f" ] && continue
Line 23:         bf=`basename "$f"`
Line 24:         if [ -f "$NET_CONF_DIR/$bf" ];

Line 18: 
Line 19: ifcfg_node_persist() {
Line 20:     for f in "$NET_CONF_BACK_DIR"/*;
Line 21:     do
Line 22:         [ ! -f "$f" ] && continue
$f will be needed to be 'ifcfg-rhevm' instead of *
Line 23:         bf=`basename "$f"`
Line 24:         if [ -f "$NET_CONF_DIR/$bf" ];
Line 25:         then
Line 26:             ovirt_store_config "$NET_CONF_DIR/$bf"

Line 48:     # https://bugzilla.redhat.com/show_bug.cgi?id=1165203
Line 49:     #
Line 50:     # TODO: remove when network restoration is splitted out of vdsmd
Line 51:     # http://gerrit.ovirt.org/29441/
Line 52:     ifcfg_node_persist
still don't get persisted.
Line 53: }
Line 54: 
Line 55: unified_nonnode_persist() {
Line 56:     # Atomic directory copy by using the atomicity of overwriting a link

Fabian Deutsch has posted comments on this change.

Change subject: store-net-config: persist ifcfg mgmt on node
......................................................................

Patch Set 1: -Code-Review

(2 comments)

http://gerrit.ovirt.org/#/c/36985/1/vdsm/vdsm-store-net-config.in
File vdsm/vdsm-store-net-config.in:

Line 16: 
Line 17: PERSISTENCE=$1
Line 18: 
Line 19: ifcfg_node_persist() {
Line 20:     for f in "$NET_CONF_BACK_DIR"/*;
> $f it will be /var/lib/vdsm/netconfback/* and will execute the continue sta

Yes, if netconfback is empty, then nothing will be persisted.
Line 21:     do
Line 22:         [ ! -f "$f" ] && continue
Line 23:         bf=`basename "$f"`
Line 24:         if [ -f "$NET_CONF_DIR/$bf" ];

Line 48:     # https://bugzilla.redhat.com/show_bug.cgi?id=1165203
Line 49:     #
Line 50:     # TODO: remove when network restoration is splitted out of vdsmd
Line 51:     # http://gerrit.ovirt.org/29441/
Line 52:     ifcfg_node_persist
> still don't get persisted.

See my comment above. But yes, we need to make sure that all files get persisted initially, so we can not look in the backup directory.
Line 53: }
Line 54: 
Line 55: unified_nonnode_persist() {
Line 56:     # Atomic directory copy by using the atomicity of overwriting a link

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

[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::#116520::OK
* Check Bug-Url::OK
* Check Public Bug::#116520::OK, public bug
* Check Product::#116520::SKIPPED, not (oVirt Red Hat Enterprise Virtualization Manager) product but Red Hat Enterprise CMS
* Check Product::WARN, no bug url with correct product found, make sure you have at least one bug-url with a product in oVirt Red Hat Enterprise Virtualization Manager.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

[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 Failed

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15126/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/14957/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14169/ : FAILURE

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

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

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

Patch Set 2: Verified+1 Code-Review+1

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

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

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

Patch Set 2:

(1 comment)

http://gerrit.ovirt.org/#/c/36985/2//COMMIT_MSG
Commit Message:

Line 16: In this patch we make sure that none of our changes to ifcfg files is to
Line 17: be persisted.
Line 18: 
Line 19: Change-Id: Ia61b2385ce0bf44a67f627caf5b73b68992349fd
Line 20: Bug-Url: https://bugzilla.redhat.com/116520
The right bug id is 1165203

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

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

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

Patch Set 3:

* 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::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

[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 3:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/15135/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/14966/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/14178/ : FAILURE

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

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

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

Patch Set 3: Code-Review+2

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

[Dan Kenigsberg]

Dan Kenigsberg 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 
---
M vdsm/network/configurators/ifcfg.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved

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

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

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

Patch Set 4:

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

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

[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 4:

Build Failed

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6327/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/507/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/505/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/500/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/482/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el7-x86_64_mer... : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-el6-x86_64_mer... : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc20-x86_64_me... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master-libgfapi_create-rpms-fc21-x86_64_me... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4492/ : FAILURE