Nir Soffer has uploaded a new change for review.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
sp: Streamline building domains list for upgrade
Instead of creating a list of domain uuids, and removing the master domain uuid, remove the master the domain uuid from the domains dict. This avoids noisy exception handler and using \ continuation.
While touching this code, also fix the log, we are not marking *all* domains for upgrade but only active domains.
Change-Id: I2be0a4816d733fdae13bcb933201b1ede795ca68 Signed-off-by: Nir Soffer nsoffer@redhat.com --- M vdsm/storage/sp.py 1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/65043/1
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 8e0b4bd..ef2e9a28 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -426,13 +426,10 @@ self._convertDomain(self.masterDomain, str(targetDomVersion))
- self.log.debug("Marking all domains for upgrade") - self._domainsToUpgrade = self.getDomains(activeOnly=True)\ - .keys() - try: - self._domainsToUpgrade.remove(self.masterDomain.sdUUID) - except ValueError: - pass + self.log.debug("Marking active domains for upgrade") + domains = self.getDomains(activeOnly=True) + domains.pop(self.masterDomain.sdUUID, None) + self._domainsToUpgrade = domains.keys()
self.log.debug("Registering with state change event") self.domainMonitor.onDomainStateChange.register(
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
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-4.0'])
Nir Soffer has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 1: Continuous-Integration+1
Network tests on python 3
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
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-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
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-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 4:
* 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-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 5:
* 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-4.0'])
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 6:
* 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-4.0'])
Nir Soffer has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 6: Verified+1
Nir Soffer has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 6: Continuous-Integration+1
Test failures not relevant.
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 7:
* 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-4.0'])
Freddy Rolland has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 7: Code-Review+1
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 8:
* 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-4.0'])
Adam Litke has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 8: Code-Review+2
Nir Soffer has submitted this change and it was merged.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
sp: Streamline building domains list for upgrade
Instead of creating a list of domain uuids, and removing the master domain uuid, remove the master the domain uuid from the domains dict. This avoids noisy exception handler and using \ continuation.
While touching this code, also fix the log, we are not marking *all* domains for upgrade but only active domains.
Change-Id: I2be0a4816d733fdae13bcb933201b1ede795ca68 Signed-off-by: Nir Soffer nsoffer@redhat.com Reviewed-on: https://gerrit.ovirt.org/65043 Reviewed-by: Freddy Rolland frolland@redhat.com Continuous-Integration: Jenkins CI Reviewed-by: Adam Litke alitke@redhat.com --- M vdsm/storage/sp.py 1 file changed, 4 insertions(+), 7 deletions(-)
Approvals: Adam Litke: Looks good to me, approved Nir Soffer: Verified Jenkins CI: Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve
gerrit-hooks has posted comments on this change.
Change subject: sp: Streamline building domains list for upgrade ......................................................................
Patch Set 9:
* Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found.
vdsm-patches@lists.fedorahosted.org