Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


net: add documentation for setupNetworks rollback mechanism.

Since Ifcfg is both the default implementation and the exception of
this mechanism, a few comments might make this situation less confusing.

Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Signed-off-by: Ido Barkan 
Signed-off-by: Edward Haas 
Reviewed-on: https://gerrit.ovirt.org/50261
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg 
---
M lib/vdsm/network/api.py
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/configurators/ifcfg.py
M vdsm/API.py
4 files changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Verified; Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 4:

* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/50261/2/lib/vdsm/network/configurators/__init__.py
File lib/vdsm/network/configurators/__init__.py:

Line 33: from ..models import Bond, Bridge, hierarchy_vlan_tag, 
hierarchy_backing_device
Line 34: from ..sourceroute import StaticSourceRoute
Line 35: 
Line 36: 
Line 37: class RollbackIncomplete(Exception):
> Should we add a remark that currently this exception does not reach vdsm? (
You're welcome to add: "Note that it is never raised by the default ifcfg 
configurator"
Line 38: """This exception is raised in order to signal API.Global that a 
call to
Line 39: setupNetworks has failed and there are leftovers that need to be 
cleaned
Line 40: up.
Line 41: """


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/50261/2/lib/vdsm/network/configurators/__init__.py
File lib/vdsm/network/configurators/__init__.py:

Line 33: from ..models import Bond, Bridge, hierarchy_vlan_tag, 
hierarchy_backing_device
Line 34: from ..sourceroute import StaticSourceRoute
Line 35: 
Line 36: 
Line 37: class RollbackIncomplete(Exception):
Should we add a remark that currently this exception does not reach vdsm? 
(handled by ifcfg configurator)
Line 38: """This exception is raised in order to signal API.Global that a 
call to
Line 39: setupNetworks has failed and there are leftovers that need to be 
cleaned
Line 40: up.
Line 41: """


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/50261/2/lib/vdsm/network/configurators/__init__.py
File lib/vdsm/network/configurators/__init__.py:

Line 33: from ..models import Bond, Bridge, hierarchy_vlan_tag, 
hierarchy_backing_device
Line 34: from ..sourceroute import StaticSourceRoute
Line 35: 
Line 36: 
Line 37: class RollbackIncomplete(Exception):
> You're welcome to add: "Note that it is never raised by the default ifcfg c
Done
Line 38: """This exception is raised in order to signal API.Global that a 
call to
Line 39: setupNetworks has failed and there are leftovers that need to be 
cleaned
Line 40: up.
Line 41: """


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 3:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 3: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 3: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[ibarkan]

Ido Barkan has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 2:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[ibarkan]

Ido Barkan has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 1:

(2 comments)

https://gerrit.ovirt.org/#/c/50261/1/lib/vdsm/network/api.py
File lib/vdsm/network/api.py:

Line 914: excepted
> I don't think that the English verb means what you want here.
Done


https://gerrit.ovirt.org/#/c/50261/1/vdsm/API.py
File vdsm/API.py:

Line 1522: cleanup is done.
> I don't understand this text. At this point, we are about to try to do a ro
Done


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 1: Code-Review-1

(2 comments)

https://gerrit.ovirt.org/#/c/50261/1/lib/vdsm/network/api.py
File lib/vdsm/network/api.py:

Line 914: excepted
I don't think that the English verb means what you want here.
"handled", maybe?


https://gerrit.ovirt.org/#/c/50261/1/vdsm/API.py
File vdsm/API.py:

Line 1522: cleanup is done.
I don't understand this text. At this point, we are about to try to do a 
rollback. Before the next line succeeds, cleanup is not yet done.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[ibarkan]

Ido Barkan has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 1: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: Ido Barkan 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: add documentation for setupNetworks rollback mechanism.

[ibarkan]

Ido Barkan has uploaded a new change for review.

Change subject: net: add documentation for setupNetworks rollback mechanism.
..

net: add documentation for setupNetworks rollback mechanism.

Since Ifcfg is both the default implementation and the exception of
this mechanism, a few comments might make this situation less confusing.

Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Signed-off-by: Ido Barkan 
---
M lib/vdsm/network/api.py
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/configurators/ifcfg.py
M vdsm/API.py
4 files changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/50261/1

diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index 4ba04c3..53d3dc2 100755
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -911,6 +911,9 @@
 normalized_config = kernelconfig.normalize(
 netconfpersistence.BaseConfig(networks, bondings))
 with ConfiguratorClass(in_rollback) as configurator:
+# from this point forward, any exception thrown will be excepted by
+# Configurator.__exit__.
+
 # Remove edited networks and networks with 'remove' attribute
 for network, attrs in networks.items():
 if network in _netinfo.networks:
diff --git a/lib/vdsm/network/configurators/__init__.py 
b/lib/vdsm/network/configurators/__init__.py
index f49bdab..a2db924 100644
--- a/lib/vdsm/network/configurators/__init__.py
+++ b/lib/vdsm/network/configurators/__init__.py
@@ -35,6 +35,10 @@
 
 
 class RollbackIncomplete(Exception):
+"""This exception is raised in order to signal API.Global that a call to
+setupNetworks has failed and there are leftovers that need to be cleaned
+up.
+"""
 pass
 
 
diff --git a/lib/vdsm/network/configurators/ifcfg.py 
b/lib/vdsm/network/configurators/ifcfg.py
index 691c22a..550d344 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -83,6 +83,9 @@
 self.runningConfig = RunningConfig()
 
 def rollback(self):
+"""This reimplementation always returns None since Ifcfg can rollback
+on its own via restoreBackups(). This makes the general mechanism of
+API.Global._rollback redundant in this case."""
 self.configApplier.restoreBackups()
 self.configApplier = None
 if self.unifiedPersistence:
diff --git a/vdsm/API.py b/vdsm/API.py
index 99a368b..6bbedbe 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1507,12 +1507,19 @@
 try:
 yield rollbackCtx
 except ConfigNetworkError as e:
+# Only a configuration error in setupNetworks before any damage
+# done. No need for cleanup.
 self.log.error(e.message, exc_info=True)
 rollbackCtx['status'] = {'code': e.errCode, 'message': e.message}
 except RollbackIncomplete as roi:
+# a previous call to setupNetworks (with 'inRollback': False)
+# failed and we need to try and cleanup.
 config, excType, value = roi
 tb = sys.exc_info()[2]
 try:
+# config holds the difference between RunningConfig on disk and
+# the one in memory with the addition of {'remove': True} hence
+# cleanup is done.
 supervdsm.getProxy().setupNetworks(
 config.networks, config.bonds, {'inRollback': True,
 'connectivityCheck': 0})


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f7d66f9612ed6762fa80e7aa9e57d914dd65f34
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches