Change in vdsm[master]: netconf: drop rollback to last persisted if mem rollback fails

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................

netconf: drop rollback to last persisted if mem rollback fails

When memory rollback fails it is likely to be due to a malfunction
or a state that we probably can't handle. The previous behavior was
to let that on the hands of the oVirt fencing. This patch restores
the known and expected behavior.

Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M vdsm/netconf/__init__.py
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/21867/1

diff --git a/vdsm/netconf/__init__.py b/vdsm/netconf/__init__.py
index 50934a5..564c4a8 100644
--- a/vdsm/netconf/__init__.py
+++ b/vdsm/netconf/__init__.py
@@ -24,9 +24,7 @@
 from sourceRoute import StaticSourceRoute
 from vdsm import netinfo
 from vdsm.config import config
-from vdsm.constants import EXT_VDSM_RESTORE_NET_CONFIG
 from vdsm.netconfpersistence import RunningConfig
-from vdsm.utils import execCmd
 
 
 class Configurator(object):
@@ -47,12 +45,10 @@
         if type is None:
             self.commit()
         elif self._inRollback:
-            # If we failed the rollback transaction, we try to apply the last
-            # known good network configuration, i.e., last persistent.
-            rc, _, err = execCmd(EXT_VDSM_RESTORE_NET_CONFIG, raw=True)
-            if not rc:
-                logging.error('Failed rollback transaction and restoration to '
-                              'last known good network. ERR=%s', err)
+            # If we failed the rollback transaction, the networking system
+            # is in no good state and we fail hard
+            logging.error('Failed rollback transaction last known good '
+                          'network. ERR=%s', value)
         else:
             self.rollback()
 


-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................


netconf: drop rollback to last persisted if mem rollback fails

When memory rollback fails it is likely to be due to a malfunction
or a state that we probably can't handle. The previous behavior was
to let that on the hands of the oVirt fencing. This patch restores
the known and expected behavior.

Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/21867
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Tested-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/netconf/__init__.py
1 file changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................


Patch Set 2: Verified+1

-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................


Patch Set 2: Code-Review+2

-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................


Patch Set 2:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5812/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_network_functional_tests/930/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5904/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5016/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netconf: drop rollback to last persisted if mem rollback fails
......................................................................


Patch Set 1:

Build Successful 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5811/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_network_functional_tests/929/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5903/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5015/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/21867
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iefcad39b37066c0e52a1da85144a074c63bed174
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No