Change in vdsm[master]: netconf: Make vdsm-restore-net-config use _inRollback

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................

netconf: Make vdsm-restore-net-config use _inRollback

Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M vdsm/vdsm-restore-net-config
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/21977/1

diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 29b2a8d..4227e4e 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -48,7 +48,8 @@
         removeBonds[bond] = {'remove': True}
     logging.debug('Removing all networks (%s) and bonds (%s) in running '
                   'config.', removeNetworks, removeBonds)
-    setupNetworks(removeNetworks, removeBonds, connectivityCheck=False)
+    setupNetworks(removeNetworks, removeBonds, connectivityCheck=False,
+                  _inRollback=True)
 
     configurator.flush()
     persistentConfig = PersistentConfig()
@@ -56,7 +57,7 @@
     bonds = persistentConfig.bonds
     logging.debug('Calling setupNetworks with networks (%s) and bond (%s).',
                   nets, bonds)
-    setupNetworks(nets, bonds, connectivityCheck=False)
+    setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True)
 
 
 def restore():


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

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

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 4: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: 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-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


netconf: Make vdsm-restore-net-config use _inRollback

The setup networks operations performed by vdsm-restore-net-config
are by nature rollback operations. They are split into two steps,
- removal of the nets.
- configuration of the persisted network config.

Each of the preceding actions has a different rollback context,
making a possible memory rollback (if _inRollback was not used)
rather fruitless, specially when booting up when there is nothing
to roll back to. It is better that the operations are set as
not elegible for rollback.

Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/21977
Reviewed-by: Assaf Muller <amuller(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/vdsm-restore-net-config
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Antoni Segura Puimedon: Verified
  Assaf Muller: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: 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;

Antoni Segura Puimedon has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 4: Verified+1

copying score.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: 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-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 3: Code-Review-1

(1 comment)

....................................................
Commit Message
Line 3: AuthorDate: 2013-12-03 18:18:28 +0100
Line 4: Commit:     Gerrit Code Review <gerrit2(a)gerrit.ovirt.org&gt;
Line 5: CommitDate: 2013-12-03 15:15:43 -0500
Line 6: 
Line 7: netconf: Make vdsm-restore-net-config use _inRollback
I still do not understand why this is is required/good.

(I was not kidding when I said that this change needs a commit message of its own...)
Line 8: 
Line 9: Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-HasComments: Yes

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 3: Verified-1

Build Failed 

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

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

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5981/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(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: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 1: Verified-1

Build Failed 

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

http://jenkins.ovirt.org/job/vdsm_network_functional_tests/943/ : FAILURE

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5973/ : FAILURE

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

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

Assaf Muller has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 4: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: 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-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: netconf: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 4: Verified-1

Build Failed 

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

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

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5994/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Iee212bdd6bbf5bcc27dc0a85b2fe6f690ac6dcd0
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(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: Make vdsm-restore-net-config use _inRollback
......................................................................


Patch Set 2: Verified-1

Build Failed 

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

http://jenkins.ovirt.org/job/vdsm_network_functional_tests/945/ : FAILURE

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5975/ : FAILURE

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

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