July 2015 - vdsm-patches - Fedora mailing-lists

Change in vdsm[ovirt-3.5]: net: tests: clean legacy bonds from kernelConfig
by ibarkan＠redhat.com 14 Jul '15

14 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: tests: clean legacy bonds from kernelConfig ...................................................................... net: tests: clean legacy bonds from kernelConfig VdsProxy netinfo is built from getVdsCapabilities which reports fake legacy bonds in el6. Remove them from here to avoid lying to KernelConfig Change-Id: I094eb615bbe05e4661b34e8374d105401b8db8b6 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Label: ovirt-3.5-only Bug-Url: https://bugzilla.redhat.com/1203422 --- M tests/functional/networkTests.py 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/43513/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index c29ff01..39fa251 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -17,6 +17,7 @@ # Refer to the README and COPYING files for full details of the license # from contextlib import contextmanager +import copy from functools import wraps import os.path import json @@ -352,7 +353,7 @@ return status, msg def _assert_kernel_config_matches_running_config(self): - netinfo = self.vdsm_net.netinfo + netinfo = self._clean_legacy_bonds(self.vdsm_net.netinfo) kernel_config = KernelConfig(netinfo) running_config = self.vdsm_net.config # do not use KernelConfig.__eq__ to get better exception if something @@ -361,6 +362,16 @@ self.assertEqual(normalized_config.networks, kernel_config.networks) self.assertEqual(normalized_config.bonds, kernel_config.bonds) + def _clean_legacy_bonds(self, netinfo): + """VdsProxy netinfo is built from getVdsCapabilities which reports + fake legacy bonds in el6. Remove them from here to avoid lying to + KernelConfig + """ + netinfo = copy.deepcopy(netinfo) + for bond in caps._REQUIRED_BONDINGS: + netinfo.bondings.pop(bond, None) + return netinfo + @cleanupNet @permutations([[True], [False]]) @RequireDummyMod -- To view, visit https://gerrit.ovirt.org/43513 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I094eb615bbe05e4661b34e8374d105401b8db8b6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 12

Change in vdsm[master]: vm: events: reorganize events
by fromani＠redhat.com 14 Jul '15

14 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: events: reorganize events ...................................................................... Patch Set 2: (6 comments) https://gerrit.ovirt.org/#/c/43538/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 377: self._lastStatus = value Line 378: Line 379: def send_status_event(self, **kwargs): Line 380: vm_status = self._getVmStatus() Line 381: if vm_status != vmstatus.WAIT_FOR_LAUNCH: > I believe this could go away, we never send this now when events are not be We do but as side effect. Please see comment on line 1810 below. Line 382: stats = {'status': vm_status} Line 383: stats.update(kwargs) Line 384: self._notify('VM_status', stats) Line 385: Line 1147: with self._confLock: Line 1148: del self.conf['pauseCode'] Line 1149: except KeyError: Line 1150: pass Line 1151: self.send_status_event() move into an else: block; even better: move outside the lock Line 1152: return {'status': doneCode, 'output': ['']} Line 1153: finally: Line 1154: if not guestCpuLocked: Line 1155: self._guestCpuLock.release() Line 1165: self._setGuestCpuRunning(self._isDomainRunning(), Line 1166: guestCpuLocked=True) Line 1167: self._logGuestCpuStatus('pause') Line 1168: self._lastStatus = afterState Line 1169: self.send_status_event() same Line 1170: return {'status': doneCode, 'output': ['']} Line 1171: finally: Line 1172: if not guestCpuLocked: Line 1173: self._guestCpuLock.release() Line 1530: try: Line 1531: self._migrationSourceThread.stop() Line 1532: self._migrationSourceThread.status['status']['message'] = \ Line 1533: 'Migration process cancelled' Line 1534: self.send_status_event() > did you test this flow? I wonder if we were handling this flow correctly. W For cancellation, libvirt raises ABORTED error, so we should end up anyway in _recover. So this is probably redundant. Will check and most likely remove. Line 1535: return self._migrationSourceThread.status Line 1536: except libvirt.libvirtError as e: Line 1537: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_INVALID: Line 1538: return errCode['migCancelErr'] Line 1806: # case VDSM is upgraded from 3.4 to 3.5 on the host without Line 1807: # rebooting it. Evident on, but not limited to, the HE case. Line 1808: self._fixLegacyConf() Line 1809: Line 1810: self.send_status_event() this is where we send MIGRATION_DESTINATION and the reason for the check for WAIT_FOR_LAUNCH in send_status_event. AFAIU MIGRATION_DESTINATION is useless, so I'll remove this one. Line 1811: Line 1812: self._devices = self.devMapFromDevSpecMap(dev_spec_map) Line 1813: Line 1814: # We should set this event as a last part of drives initialization Line 3649: # Terminate the VM's creation thread. Line 3650: self._incomingMigrationFinished.set() Line 3651: self.guestAgent.stop() Line 3652: Line 3653: self.send_status_event() > As per discussion with Omer this is not needed on engine side and in fact c Indeed seems redundant or even counterproductive. Will remove. Line 3654: Line 3655: if self._dom: Line 3656: result = self._destroyVmGraceful() Line 3657: if result['status']['code']: -- To view, visit https://gerrit.ovirt.org/43538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37c198478bcc289a713ac61df82900ae2cd6c201 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: events: reorganize events
by michal.skrivanek＠redhat.com 14 Jul '15

14 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: events: reorganize events ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/43538/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 3649: # Terminate the VM's creation thread. Line 3650: self._incomingMigrationFinished.set() Line 3651: self.guestAgent.stop() Line 3652: Line 3653: self.send_status_event() As per discussion with Omer this is not needed on engine side and in fact confuses the engine to process Down VMs twice. It should not be needed as onQemuDeath will emit event on its own anyway Line 3654: Line 3655: if self._dom: Line 3656: result = self._destroyVmGraceful() Line 3657: if result['status']['code']: -- To view, visit https://gerrit.ovirt.org/43538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37c198478bcc289a713ac61df82900ae2cd6c201 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: adding StorageDomain.activateHsm()
by automation＠ovirt.org 14 Jul '15

14 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.activateHsm() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68eccd300b8ba0cc45b2485f978eb3ae367c16e2 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 14 Jul '15

14 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic53b19a43850341ee488b50fbb339fdf68c1a048 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-3.5]: net: fix python 2.7 specific code
by ibarkan＠redhat.com 14 Jul '15

14 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: fix python 2.7 specific code ...................................................................... net: fix python 2.7 specific code This syntax is only supported in python 2.7 hence should be removed from 3.5 branch which also supports el6's python 2.6.6. Label: ovirt-3.5-only Change-Id: Ic51448702d567c8926149232db14e2d689c29880 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1203422 --- M tests/functional/networkTests.py M tests/functional/utils.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/43512/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index b17ce17..c29ff01 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1686,10 +1686,10 @@ self.assertEquals(status, SUCCESS, msg) _assert_all_nets_exist() # verify that the running config now has all desired networks - self.assertEqual({NET_MGMT, NET_CHANGED, NET_UNCHANGED, - NET_ADDITIONAL}, + self.assertEqual(set([NET_MGMT, NET_CHANGED, NET_UNCHANGED, + NET_ADDITIONAL]), set(self.vdsm_net.config.networks.keys())) - self.assertEqual({BOND_CHANGED, BOND_UNCHANGED}, + self.assertEqual(set([BOND_CHANGED, BOND_UNCHANGED]), set(self.vdsm_net.config.bonds.keys())) finally: diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 618b272..7d82f8a 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -156,7 +156,7 @@ stack = inspect.stack() # add calling method for logs test_method, code_line = stack[3][3], stack[3][2] - options['_caller'] = '{}:{}'.format(test_method, code_line) + options['_caller'] = '%s:%s'.format(test_method, code_line) result = self.vdscli.setupNetworks(networks, bonds, options) return result['status']['code'], result['status']['message'] -- To view, visit https://gerrit.ovirt.org/43512 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic51448702d567c8926149232db14e2d689c29880 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 5

Change in vdsm[ovirt-3.5]: net: _upgrade_onboot failed on python 2.6.6
by ibarkan＠redhat.com 14 Jul '15

14 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: _upgrade_onboot failed on python 2.6.6 ...................................................................... net: _upgrade_onboot failed on python 2.6.6 The flags keyword argument was added only on python 2.7. Change-Id: I5be906c7e26abc5c870566202fefb38ffe0b8bb2 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/43507/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 6c30685..c879442 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -104,8 +104,7 @@ def _upgrade_onboot(ifcfg_file): with open(ifcfg_file) as f: old_content = f.read() - new_content = re.sub('^ONBOOT=no$', 'ONBOOT=yes', old_content, - flags=re.MULTILINE) + new_content = re.sub('ONBOOT=no', 'ONBOOT=yes', old_content) if new_content != old_content: logging.debug("updating %s to ONBOOT=yes", ifcfg_file) with open(ifcfg_file, 'w') as f: -- To view, visit https://gerrit.ovirt.org/43507 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5be906c7e26abc5c870566202fefb38ffe0b8bb2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 11

Change in vdsm[master]: vm: events: reorganize events
by michal.skrivanek＠redhat.com 14 Jul '15

14 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: events: reorganize events ...................................................................... Patch Set 2: Code-Review+1 (4 comments) https://gerrit.ovirt.org/#/c/43538/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 377: self._lastStatus = value Line 378: Line 379: def send_status_event(self, **kwargs): Line 380: vm_status = self._getVmStatus() Line 381: if vm_status != vmstatus.WAIT_FOR_LAUNCH: I believe this could go away, we never send this now when events are not being triggered by libvirt Line 382: stats = {'status': vm_status} Line 383: stats.update(kwargs) Line 384: self._notify('VM_status', stats) Line 385: Line 868: self._guestEventTime = self._startTime Line 869: self._guestEvent = vmstatus.REBOOT_IN_PROGRESS Line 870: self._powerDownEvent.set() Line 871: self.saveState() Line 872: self.guestAgent.onReboot() I suppose this triggers event already Some refactoring around _guestEvent would be nice in future, I think we can do without it Line 873: if self.conf.get('volatileFloppy'): Line 874: self._ejectFloppy() Line 875: self.log.debug('ejected volatileFloppy') Line 876: except Exception: Line 1451: return vmstatus.UP Line 1452: Line 1453: statuses = (vmstatus.SAVING_STATE, vmstatus.RESTORING_STATE, Line 1454: vmstatus.MIGRATION_SOURCE, vmstatus.MIGRATION_DESTINATION, Line 1455: vmstatus.PAUSED, vmstatus.DOWN) I think this helps fixing a small race we have Line 1456: if self.lastStatus in statuses: Line 1457: return self.lastStatus Line 1458: elif self.isMigrating(): Line 1459: if self._migrationSourceThread.hibernating: Line 1530: try: Line 1531: self._migrationSourceThread.stop() Line 1532: self._migrationSourceThread.status['status']['message'] = \ Line 1533: 'Migration process cancelled' Line 1534: self.send_status_event() did you test this flow? I wonder if we were handling this flow correctly. Where is the lastStatus changed from MIGRATION_SOURCE to UP? For failed migrations it's in _recover(), but for cancellation - do we always get libvirt event? Or some other way? Line 1535: return self._migrationSourceThread.status Line 1536: except libvirt.libvirtError as e: Line 1537: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_INVALID: Line 1538: return errCode['migCancelErr'] -- To view, visit https://gerrit.ovirt.org/43538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37c198478bcc289a713ac61df82900ae2cd6c201 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: StorageDomainManifest: Move clusterLock into Manifest
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: StorageDomainManifest: Move clusterLock into Manifest ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43549 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2c019a7fed6ba793d2b3a2459af221b1abbff2a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: sdm: introduce the new createVolumeContainer command
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: sdm: introduce the new createVolumeContainer command ...................................................................... Patch Set 16: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/38097 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If3ea624f81a04a830cdcbcfe2f777cdd7bd26c08 Gerrit-PatchSet: 16 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: Introduce class structure
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: Introduce class structure ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41844 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0552bea23b04b9e58e5d2cc7e016103d03194d1a Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: Metadata read utils
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: Metadata read utils ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41846 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5e02ad8138bae0b1d60b032662afbad15dd4feba Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: metadata write utils
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: metadata write utils ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41847 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia245c589ea6bc2cf9ac1b2b59b9073d1b5fc9595 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: Move the getParent API
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: Move the getParent API ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41848 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8489e18c431c89728c180735938a51dfc278671b Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: Move isLeaf, setLeaf and dependencies
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: Move isLeaf, setLeaf and dependencies ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41849 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I48e05ef7168ab835d31914e05f3abd969b6552b1 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: VolumeMetadata: Move recheckIfLeaf into *Metadata class
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: VolumeMetadata: Move recheckIfLeaf into *Metadata class ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/41850 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibddf8fc2feea49859924743f2b30e0f2fc71ebb7 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: testlib: Document --enable-xxx-tests options
by Nir Soffer 13 Jul '15

13 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: testlib: Document --enable-xxx-tests options ...................................................................... testlib: Document --enable-xxx-tests options We documented how to enable slow and stress test using environment variables, instead of the nicer --enable-slow-tests and --enable-stress-tests options. Change-Id: I325a944f6f16ea55aae20d8646d13a355d145258 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/README 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/43455/1 diff --git a/tests/README b/tests/README index c0164ef..323e63b 100644 --- a/tests/README +++ b/tests/README @@ -24,7 +24,7 @@ with the @slowtest decorator and are disabled by default. To enable slow tests: - NOSE_SLOW_TESTS=1 ./run_tests_local.sh filenme [...] + ./run_tests_local.sh --enable-slow-tests filenme [...] Enabling stress tests: --------------------- @@ -35,7 +35,7 @@ @stresstest decorator and are disabled by default. To enable stress tests: - NOSE_STRESS_TESTS=1 ./run_tests_local.sh filename [...] + ./run_tests_local.sh --enable-stress-tests filename [...] Functional test suite: ---------------------- -- To view, visit https://gerrit.ovirt.org/43455 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I325a944f6f16ea55aae20d8646d13a355d145258 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 11

Change in vdsm[master]: virt: clientif: remove generic vm status event
by fromani＠redhat.com 13 Jul '15

13 Jul '15

Francesco Romani has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 12: Verified+1 trivial patch -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 12: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 12: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 12: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 13: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 13 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 12: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: events: reorganize events
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: events: reorganize events ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37c198478bcc289a713ac61df82900ae2cd6c201 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: events: reorganize events
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: events: reorganize events ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43538 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37c198478bcc289a713ac61df82900ae2cd6c201 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: testlib: Show fully qualified class name
by Nir Soffer 13 Jul '15

13 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: testlib: Show fully qualified class name ...................................................................... testlib: Show fully qualified class name We typically have multiple test case classes in the same module, and looking in the tests results it is not clear where the tests are located. RoundTests test_round(n=0, size=1024, result=0) OK test_round(n=1, size=1024, result=1024) OK test_round(n=1024, size=1024, result=1024) OK test_round(n=1025, size=1024, result=2048) OK test_round(n=3.14, size=1024, result=1024) OK StopwatchTests test_debug OK test_info OK test_notset OK Now we show also the module name: utilsTests.RoundTests test_round(n=0, size=1024, result=0) OK test_round(n=1, size=1024, result=1024) OK test_round(n=1024, size=1024, result=1024) OK test_round(n=1025, size=1024, result=2048) OK test_round(n=3.14, size=1024, result=1024) OK utilsTests.StopwatchTests test_debug OK test_info OK test_notset OK Change-Id: I560ba4a0b4efcc7c53d85a830b8a8d4f5365ce5e Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/testlib.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/43432/1 diff --git a/tests/testlib.py b/tests/testlib.py index 4e27dbb..c7dbd12 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -296,7 +296,8 @@ def startTest(self, test): unittest.TestResult.startTest(self, test) - current_case = test.test.__class__.__name__ + current_case = "%s.%s" % (test.test.__module__, + test.test.__class__.__name__) if self.showAll: if current_case != self._last_case: -- To view, visit https://gerrit.ovirt.org/43432 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I560ba4a0b4efcc7c53d85a830b8a8d4f5365ce5e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 9

Change in vdsm[master]: testlib: Use nose.case.Test.getDescription()
by Nir Soffer 13 Jul '15

13 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: testlib: Use nose.case.Test.getDescription() ...................................................................... testlib: Use nose.case.Test.getDescription() The version we have may be ok for Python 2.6, but node version has additional code to support Python 2.7 changes, so we should use it. Change-Id: I3a31a432fbeaa6f20f35247572aa995d1fae38d1 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/testlib.py 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/43431/1 diff --git a/tests/testlib.py b/tests/testlib.py index 04485e9..4e27dbb 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -249,9 +249,6 @@ result.TextTestResult.__init__(self, *args, **kwargs) self._last_case = None - def getDescription(self, test): - return str(test) - def _writeResult(self, test, long_result, color, short_result, success): if self.showAll: colorWrite(self.stream, long_result, color) -- To view, visit https://gerrit.ovirt.org/43431 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a31a432fbeaa6f20f35247572aa995d1fae38d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 10

Change in vdsm[master]: testlib: Remove unneeded methods
by Nir Soffer 13 Jul '15

13 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: testlib: Remove unneeded methods ...................................................................... testlib: Remove unneeded methods VdsmTestRunner was implementing __init__() and run() for no reason. Maybe we used to do something in these methods in the past, but now they do nothing by invoke the superclass methods, so should remove them. Change-Id: I265c1553fbea3149e268b01e419ced974edb08b3 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/testlib.py 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/43430/1 diff --git a/tests/testlib.py b/tests/testlib.py index 763edcb..04485e9 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -336,18 +336,12 @@ class VdsmTestRunner(core.TextTestRunner): - def __init__(self, *args, **kwargs): - core.TextTestRunner.__init__(self, *args, **kwargs) def _makeResult(self): return VdsmTestResult(self.stream, self.descriptions, self.verbosity, self.config) - - def run(self, test): - result_ = core.TextTestRunner.run(self, test) - return result_ def run(): -- To view, visit https://gerrit.ovirt.org/43430 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I265c1553fbea3149e268b01e419ced974edb08b3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 9

Change in vdsm[master]: vm: run before_vm_create hook only in the VM boot
by fromani＠redhat.com 13 Jul '15

13 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: run before_vm_create hook only in the VM boot ...................................................................... vm: run before_vm_create hook only in the VM boot The 'before_vm_create' hook is running in two flows: * as expected, in the VM creation flow. * as may not be expected, in the VM dehybernation flow. The latter is surprising and, most important, contractdicting because in the dehibernation flow * the domain XML returned by the before_vm_create is never used * just after the before_vm_create hook, we run the before_vm_dehibernate hook with the stored domain XML. At risk to breaking some probably already incorrect hook, this patch makes the before_vm_create hook run only in the VM creation path. Change-Id: I2ad05e39029acc7b898c7b2af2141bba1d7d3c8e Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/34530/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 6e46119..751947e 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2667,10 +2667,6 @@ # we need to complete the initialization, including # domDependentInit, after the migration is completed. - if not self.recovering and initDomain: - domxml = hooks.before_vm_start(self._buildDomainXML(), self.conf) - self.log.debug(domxml) - if self.recovering: self._dom = NotifyingVirDomain( self._connection.lookupByUUIDString(self.id), @@ -2698,6 +2694,9 @@ self._connection.lookupByUUIDString(self.id), self._timeoutExperienced) else: + domxml = hooks.before_vm_start(self._buildDomainXML(), self.conf) + self.log.debug(domxml) + flags = libvirt.VIR_DOMAIN_NONE if 'launchPaused' in self.conf: flags |= libvirt.VIR_DOMAIN_START_PAUSED -- To view, visit http://gerrit.ovirt.org/34530 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ad05e39029acc7b898c7b2af2141bba1d7d3c8e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 11

Change in vdsm[master]: vm: event: emit event on guest status change
by fromani＠redhat.com 13 Jul '15

13 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 11: Verified+1 verified that an events with extra data is indeed emitted. -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by fromani＠redhat.com 13 Jul '15

13 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 12: Verified+1 verified that an events with extra data is indeed emitted. -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by fromani＠redhat.com 13 Jul '15

13 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 11: Verified+1 verified that an events with extra data is indeed emitted. -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.activateHsm()
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.activateHsm() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68eccd300b8ba0cc45b2485f978eb3ae367c16e2 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic53b19a43850341ee488b50fbb339fdf68c1a048 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-3.5]: net: support strings for 'bridged' in kernelConfig
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: support strings for 'bridged' in kernelConfig ...................................................................... net: support strings for 'bridged' in kernelConfig Because kernelConfig did not know how to normalize this parameter in running config, _should_keep_bridged got wrong parameters if setupNetworks edited a network with 'bridged': 'false'. This resulted in a bridge being left behind after the network was removed. Change-Id: Ib6eb36e69c14c752712ed16d86ed5dd37007f7b7 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py M tests/functional/networkTests.py 2 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/43446/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index b8de93d..02deb8c 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -326,9 +326,11 @@ def _normalize_bridge(self, config_copy): for net_attr in config_copy.networks.itervalues(): - if net_attr.get('bridged', True): + if utils.tobool(net_attr.get('bridged', True)): net_attr['bridged'] = True self._normalize_stp(net_attr) + else: + net_attr['bridged'] = False def _normalize_stp(self, net_attr): stp = net_attr.pop('stp', net_attr.pop('STP', None)) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index adc7d1c..3edc2bc 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1491,7 +1491,28 @@ self.assertEquals(status, SUCCESS, msg) self.vdsm_net.save_config() - + + @cleanupNet + @RequireDummyMod + @ValidateRunningAsRoot + def testRemovingBridgeDoesNotLeaveBridge(self): + with dummyIf(1) as nics: + nic, = nics + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'STP': 'no', 'bridged': 'true', + 'mtu': 1500}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + bridge = ipwrapper.getLink(NETWORK_NAME) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'bridged': 'false', 'mtu': 1500}}, + {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + self.assertNotIn( + bridge.name, (l.name for l in ipwrapper.getLinks())) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'remove': True}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + @cleanupNet @RequireDummyMod @ValidateRunningAsRoot -- To view, visit https://gerrit.ovirt.org/43446 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6eb36e69c14c752712ed16d86ed5dd37007f7b7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 6

Change in vdsm[ovirt-3.5]: net: restore-nets should support ONBOOT=no
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: restore-nets should support ONBOOT=no ...................................................................... net: restore-nets should support ONBOOT=no on 3.5.x devices were persisted with ONBOOT=no. Hence, the selective restoration would call setupNetworks with only a subset of the networks and create a partial running config. To fix this, we fix all ifcfg files to have ONBOOT=yes and verify all devices are up before computing what has changed since last call to setSafeNetworkConfig. This will make the following call to setupNetwork to merely update running config with the 'fixed' networks, if at all. Change-Id: I6fa697942e6f26ee833d703437e84144c6de1334 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M tests/functional/networkTests.py M vdsm/vdsm-restore-net-config 2 files changed, 184 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/43382/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index adc7d1c..3977c9f 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -20,6 +20,7 @@ from functools import wraps import os.path import json +import re import netaddr from hookValidation import ValidatesHook @@ -52,6 +53,7 @@ import caps from network import errors +from network.configurators.ifcfg import stop_devices NETWORK_NAME = 'test-network' @@ -1527,20 +1529,13 @@ 'netmask': IP_MASK, 'bonding': BOND_MISSING}, } - def _assert_all_nets_exist(in_running_conf=True): + def _assert_all_nets_exist(): self.vdsm_net.refreshNetinfo() - self.assertNetworkExists( - NET_UNCHANGED, assert_in_running_conf=in_running_conf) - self.assertNetworkExists( - NET_CHANGED, assert_in_running_conf=in_running_conf) - self.assertNetworkExists( - NET_MISSING, assert_in_running_conf=in_running_conf) - self.assertBondExists( - BOND_UNCHANGED, [nic_a], - assert_in_running_conf=in_running_conf) - self.assertBondExists( - BOND_MISSING, [nic_b], - assert_in_running_conf=in_running_conf) + self.assertNetworkExists(NET_UNCHANGED) + self.assertNetworkExists(NET_CHANGED) + self.assertNetworkExists(NET_MISSING) + self.assertBondExists(BOND_UNCHANGED, [nic_a]) + self.assertBondExists(BOND_MISSING, [nic_b]) with dummyIf(2) as nics: nic_a, nic_b = nics @@ -1567,7 +1562,7 @@ with nonChangingOperstate(NET_UNCHANGED): self.vdsm_net.restoreNetConfig() - _assert_all_nets_exist(False) + _assert_all_nets_exist() finally: self.setupNetworks( {NET_UNCHANGED: {'remove': True}, @@ -1584,6 +1579,117 @@ self.assertBondDoesntExist(BOND_UNCHANGED, [nic_a]) @cleanupNet + @RequireDummyMod + @ValidateRunningAsRoot + def testSelectiveRestoreDuringUpgrade(self): + if vdsm.config.config.get('vars', 'net_persistence') == 'ifcfg': + raise SkipTest( + "with ifcfg persistence, vdsm-restore-net-config selective" + "restoration is not supported") + + BOND_UNCHANGED = 'bond100' + BOND_CHANGED = 'bond101' + IP_MGMT = '240.0.0.100' + NET_MGMT = NETWORK_NAME + '100' + NET_UNCHANGED = NETWORK_NAME + '101' + NET_CHANGED = NETWORK_NAME + '102' + NET_ADDITIONAL = NETWORK_NAME + '103' + IP_ADDR_UNCHANGED = '240.0.0.101' + IP_ADDR_CHANGED = '204.0.0.102' + IP_ADDR_ADDITIONAL = '204.0.0.102' + nets = { + NET_MGMT: + {'bootproto': 'none', 'ipaddr': IP_MGMT, + 'netmask': IP_MASK, 'defaultRoute': True}, + NET_UNCHANGED: + {'bootproto': 'none', + 'ipaddr': IP_ADDR_UNCHANGED, + 'netmask': IP_MASK, 'bonding': BOND_UNCHANGED, + 'defaultRoute': False}, + NET_CHANGED: + {'bootproto': 'none', + 'ipaddr': IP_ADDR_CHANGED, + 'netmask': IP_MASK, 'bonding': BOND_CHANGED}, + } + net_additional_attrs = { + 'bootproto': 'none', 'ipaddr': IP_ADDR_ADDITIONAL, + 'netmask': IP_MASK} + + def _assert_all_nets_exist(): + self.vdsm_net.refreshNetinfo() + self.assertNetworkExists(NET_MGMT) + self.assertNetworkExists(NET_UNCHANGED) + self.assertNetworkExists(NET_CHANGED) + self.assertBondExists(BOND_UNCHANGED, [nic_b]) + self.assertBondExists(BOND_CHANGED, [nic_c], options='mode=4') + + def _simulate_boot_after_upgrade(): + # all non-management devices are down and have ONBOOT=no from older + # vdsm versions. + device_names = (NET_UNCHANGED, BOND_UNCHANGED, nic_b, NET_CHANGED, + BOND_CHANGED, nic_c) + stop_devices((NET_CONF_PREF + name for name in device_names)) + for dev in device_names: + with open(NET_CONF_PREF + dev) as f: + content = f.read() + # also test the case that a bond is different from it's + # backup + content = re.sub('ONBOOT=yes', 'ONBOOT=no', content) + if dev == BOND_CHANGED: + content = re.sub('mode=4', 'mode=0', content) + with open(NET_CONF_PREF + dev, 'w') as f: + f.write(content) + # we don't have running config during boot + RunningConfig().delete() + + with dummyIf(4) as nics: + nic_a, nic_b, nic_c, nic_d = nics + nets[NET_MGMT]['nic'] = nic_a + net_additional_attrs['nic'] = nic_d + bonds = {BOND_UNCHANGED: {'nics': [nic_b]}, + BOND_CHANGED: {'nics': [nic_c], 'options': "mode=4"} + } + status, msg = self.setupNetworks(nets, bonds, NOCHK) + self.assertEquals(status, SUCCESS, msg) + _assert_all_nets_exist() + try: + self.vdsm_net.save_config() + + _simulate_boot_after_upgrade() + + with nonChangingOperstate(NET_MGMT): + self.vdsm_net.restoreNetConfig() + + status, msg = self.setupNetworks( + {NET_ADDITIONAL: net_additional_attrs}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + _assert_all_nets_exist() + # verify that the running config now has all desired networks + self.assertEqual({NET_MGMT, NET_CHANGED, NET_UNCHANGED, + NET_ADDITIONAL}, + set(self.vdsm_net.config.networks.keys())) + self.assertEqual({BOND_CHANGED, BOND_UNCHANGED}, + set(self.vdsm_net.config.bonds.keys())) + + finally: + status, msg = self.setupNetworks( + {NET_MGMT: {'remove': True}, + NET_UNCHANGED: {'remove': True}, + NET_CHANGED: {'remove': True}, + NET_ADDITIONAL: {'remove': True}}, + {BOND_CHANGED: {'remove': True}, + BOND_UNCHANGED: {'remove': True}}, + NOCHK) + self.assertEquals(status, SUCCESS, msg) + self.vdsm_net.save_config() + self.assertNetworkDoesntExist(NET_MGMT) + self.assertNetworkDoesntExist(NET_UNCHANGED) + self.assertNetworkDoesntExist(NET_CHANGED) + self.assertNetworkDoesntExist(NET_ADDITIONAL) + self.assertBondDoesntExist(BOND_CHANGED, [nic_b]) + self.assertBondDoesntExist(BOND_UNCHANGED, [nic_a]) + + @cleanupNet @permutations([[True], [False]]) @RequireDummyMod @ValidateRunningAsRoot diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 0065f5d..df37419 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -19,9 +19,11 @@ # Refer to the README and COPYING files for full details of the license # import argparse +import glob import logging import logging.config import os +import re import time import errno @@ -73,6 +75,11 @@ persistent_config = PersistentConfig() available_config = _filter_available(persistent_config) + + _verify_all_devices_are_up(list(_owned_ifcfg_files())) + + _update_running_config(persistent_config) + _wait_for_for_all_devices_up( available_config.networks.keys() + available_config.bonds.keys()) changed_config = _filter_changed_nets_bonds(available_config) @@ -83,6 +90,49 @@ logging.debug('Calling setupNetworks with networks (%s) and bond (%s).', nets, bonds) setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True) + + +def _verify_all_devices_are_up(owned_ifcfg_files): + """REQUIRED_FOR upgrade from 4.16<=vdsm<=4.16.20 + Were ifcfg files were created with ONBOOT=no. + """ + for ifcfg_file in owned_ifcfg_files: + _upgrade_onboot(ifcfg_file) + ifcfg.start_devices(owned_ifcfg_files) + + +def _upgrade_onboot(ifcfg_file): + with open(ifcfg_file) as f: + old_content = f.read() + new_content = re.sub('^ONBOOT=no$', 'ONBOOT=yes', old_content, + flags=re.MULTILINE) + if new_content != old_content: + logging.debug("updating %s to ONBOOT=yes", ifcfg_file) + with open(ifcfg_file, 'w') as f: + f.write(new_content) + + +def _update_running_config(persistent_config): + """We must recreate RunningConfig so that following setSafeNetworkConfig + will persist a valid configuration. + """ + running_config = RunningConfig() + for net, net_attr in persistent_config.networks.iteritems(): + running_config.setNetwork(net, net_attr) + for bonding, bonding_attr in persistent_config.bonds.iteritems(): + running_config.setBonding(bonding, bonding_attr) + running_config.save() + + +def _owned_ifcfg_files(): + for fpath in glob.iglob(netinfo.NET_CONF_DIR + '/*'): + if not os.path.isfile(fpath): + continue + + with open(fpath) as f: + content = f.read() + if _owned_ifcfg_content(content): + yield fpath def _convert_to_blocking_dhcp(networks): @@ -199,26 +249,29 @@ def oper_up(link): return bool(link.flags & 1 << 6) - return set([l.name for l in ipwrapper.getLinks() if - l.name in links and - _owned(l.name) and - _onboot(l.name) and - not oper_up(l)]) + return set(l.name for l in ipwrapper.getLinks() if + l.name in links and + _owned_ifcfg(l.name) and + _onboot_ifcfg(l.name) and + not oper_up(l)) -def _owned(link_name): - predicate = lambda content: ( - content.startswith('# Generated by VDSM version') or - content.startswith('# automatically generated by vdsm')) - return _ifcfg_predicate(link_name, predicate) +def _owned_ifcfg(link_name): + return _ifcfg_predicate(link_name, _owned_ifcfg_content) -def _onboot(link_name): +def _onboot_ifcfg(link_name): predicate = lambda content: any( line == 'ONBOOT=yes' for line in content.splitlines()) return _ifcfg_predicate(link_name, predicate) +def _owned_ifcfg_content(content): + return content.startswith( + '# Generated by VDSM version') or content.startswith( + '# automatically generated by vdsm') + + def _ifcfg_predicate(link_name, predicate): try: with open(netinfo.NET_CONF_PREF + link_name) as conf: -- To view, visit https://gerrit.ovirt.org/43382 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6fa697942e6f26ee833d703437e84144c6de1334 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 8

Change in vdsm[ovirt-3.5]: net: flatten ifcfg.ConfigWriter
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: flatten ifcfg.ConfigWriter ...................................................................... net: flatten ifcfg.ConfigWriter Make startDevices and stopDevices public for further use. Also, promotoe them to be module level functions because they do not need to know about the ConfigWriter state. Also, sortDeviceIfcfgs is only used with them so make them call it always. While at it, make them pep8 compatible. Change-Id: I22676ee45dc7f4be7cd1b74f3f56305cc7e1a97a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/network/configurators/ifcfg.py 1 file changed, 50 insertions(+), 45 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/43381/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index cf42256..3b3fba0 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -380,49 +380,6 @@ confFile.write(content) logging.info('Restored %s', confFilePath) - def _devType(self, content): - if re.search('^TYPE=Bridge$', content, re.MULTILINE): - return "Bridge" - elif re.search('^VLAN=yes$', content, re.MULTILINE): - return "Vlan" - elif re.search('^SLAVE=yes$', content, re.MULTILINE): - return "Slave" - else: - return "Other" - - def _sortDeviceIfcfgs(self, deviceIfcfgs): - devdict = {'Bridge': [], - 'Vlan': [], - 'Slave': [], - 'Other': []} - for confFile in deviceIfcfgs: - if not confFile.startswith(netinfo.NET_CONF_PREF): - continue - try: - content = file(confFile).read() - except IOError as e: - if e.errno == os.errno.ENOENT: - continue - else: - raise - dev = confFile[len(netinfo.NET_CONF_PREF):] - - devdict[self._devType(content)].append(dev) - - return devdict['Other'] + devdict['Vlan'] + devdict['Bridge'] - - def _stopDevices(self, deviceIfcfgs): - for dev in reversed(deviceIfcfgs): - ifdown(dev) - - def _startDevices(self, deviceIfcfgs): - for dev in deviceIfcfgs: - try: - ifup(dev) - except ConfigNetworkError: - logging.error('Failed to ifup device %s during rollback.', dev, - exc_info=True) - @classmethod def _persistentBackup(cls, filename): """ Persistently backup ifcfg-* config files """ @@ -491,12 +448,12 @@ if not self._backups and not self._networksBackups: return - self._stopDevices(self._sortDeviceIfcfgs(self._backups.iterkeys())) + stop_devices(self._backups.iterkeys()) self.restoreAtomicNetworkBackup() self.restoreAtomicBackup() - self._startDevices(self._sortDeviceIfcfgs(self._backups.iterkeys())) + start_devices((self._backups.iterkeys())) @classmethod def clearBackups(cls): @@ -776,6 +733,54 @@ self.setIfaceMtu(slave, newmtu) +def stop_devices(device_ifcfgs): + for dev in reversed(_sort_device_ifcfgs(device_ifcfgs)): + ifdown(dev) + + +def start_devices(device_ifcfgs): + for dev in _sort_device_ifcfgs(device_ifcfgs): + try: + ifup(dev) + except ConfigNetworkError: + logging.error('Failed to ifup device %s during rollback.', dev, + exc_info=True) + + +def _sort_device_ifcfgs(device_ifcfgs): + devices = {'Bridge': [], + 'Vlan': [], + 'Slave': [], + 'Other': []} + for conf_file in device_ifcfgs: + if not conf_file.startswith(netinfo.NET_CONF_PREF): + continue + try: + with open(conf_file) as f: + content = f.read() + except IOError as e: + if e.errno == os.errno.ENOENT: + continue + else: + raise + dev = conf_file[len(netinfo.NET_CONF_PREF):] + + devices[_dev_type(content)].append(dev) + + return devices['Other'] + devices['Vlan'] + devices['Bridge'] + + +def _dev_type(content): + if re.search('^TYPE=Bridge$', content, re.MULTILINE): + return "Bridge" + elif re.search('^VLAN=yes$', content, re.MULTILINE): + return "Vlan" + elif re.search('^SLAVE=yes$', content, re.MULTILINE): + return "Slave" + else: + return "Other" + + def ifdown(iface): "Bring down an interface" rc, out, err = utils.execCmd([constants.EXT_IFDOWN, iface], raw=True) -- To view, visit https://gerrit.ovirt.org/43381 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22676ee45dc7f4be7cd1b74f3f56305cc7e1a97a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 7

Change in vdsm[ovirt-3.5]: net: wait for restored devices to be up
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: wait for restored devices to be up ...................................................................... net: wait for restored devices to be up If restore-net-config does not wait for all devices to be up, it might observe a transient kernel state where, for example, bonding devices might report no slaves. This makes restoration re-restore a bond because it is reported by the kernel as different from the persisted device. Change-Id: I3cd3de577e5d0bcf5e87c4894e94e03c209ce76a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1203422 --- M vdsm/vdsm-restore-net-config 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/43222/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 17957c0..7968da3 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -22,8 +22,10 @@ import logging import logging.config import os +import time from vdsm.config import config +from vdsm import ipwrapper from vdsm import netinfo from vdsm.constants import P_VDSM_RUN from vdsm.netconfpersistence import KernelConfig, BaseConfig @@ -38,6 +40,7 @@ import pkgutil _NETS_RESTORED_MARK = os.path.join(P_VDSM_RUN, 'nets_restored') +_ALL_DEVICES_UP_TIMEOUT = 30 def ifcfg_restoration(): @@ -68,6 +71,8 @@ persistent_config = PersistentConfig() available_config = _filter_available(persistent_config) + _wait_for_for_all_devices_up( + available_config.networks.keys() + available_config.bonds.keys()) changed_config = _filter_changed_nets_bonds(available_config) nets = changed_config.networks bonds = changed_config.bonds @@ -168,6 +173,36 @@ return changed_or_missing +def _wait_for_for_all_devices_up(links): + sleep_time = 1 + time_left = _ALL_DEVICES_UP_TIMEOUT + + down_links = _get_links_with_state_down(links) + + # TODO: use netlink monitor here might be more elegant (not available in + # TODO: 3.5) + while down_links and time_left > 0: + logging.debug("waiting for %s to be up.", down_links) + time.sleep(sleep_time) + time_left -= sleep_time + down_links = _get_links_with_state_down(links) + + if down_links: + logging.warning("Not all devices are up. VDSM might restore them " + "although they were not changed since they were " + "persisted.") + else: + logging.debug("All devices are up.") + + +def _get_links_with_state_down(links): + def oper_up(link): + return bool(link.flags & 1 << 6) + + return set([l.name for l in ipwrapper.getLinks() if + l.name in links and not oper_up(l)]) + + def _get_all_configurators(): """Returns the class objects of all the configurators in the netconf pkg""" prefix = configurators.__name__ + '.' -- To view, visit https://gerrit.ovirt.org/43222 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cd3de577e5d0bcf5e87c4894e94e03c209ce76a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 13

Change in vdsm[ovirt-3.5]: no need to call setupNetworks with empty argument during net...
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/43276 to review the following change. Change subject: no need to call setupNetworks with empty argument during network restoration ...................................................................... no need to call setupNetworks with empty argument during network restoration It is not smart to trust setupNetwork implementation so that it is really a no-op when called with empty input. Change-Id: If7de328832c53ef40748c4e932b4340abf1ecf11 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Reviewed-on: https://gerrit.ovirt.org/38745 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/43276/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index c4a9288..ca4ae5b 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -61,10 +61,11 @@ removeNetworks[network] = {'remove': True} for bond in runningConfig.bonds: removeBonds[bond] = {'remove': True} - logging.debug('Removing all networks (%s) and bonds (%s) in running ' - 'config.', removeNetworks, removeBonds) - setupNetworks(removeNetworks, removeBonds, connectivityCheck=False, - _inRollback=True) + if removeNetworks or removeBonds: + logging.debug('Removing all networks (%s) and bonds (%s) in running ' + 'config.', removeNetworks, removeBonds) + setupNetworks(removeNetworks, removeBonds, connectivityCheck=False, + _inRollback=True) # Restore non-VDSM network devices (BZ#1188251) configWriter = ifcfg.ConfigWriter() @@ -78,9 +79,10 @@ nets = changed_config.networks bonds = changed_config.bonds _convert_to_blocking_dhcp(nets) - logging.debug('Calling setupNetworks with networks (%s) and bond (%s).', - nets, bonds) - setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True) + if nets or bonds: + logging.debug('Calling setupNetworks with networks (%s) and bond (%s).', + nets, bonds) + setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True) def _convert_to_blocking_dhcp(networks): -- To view, visit https://gerrit.ovirt.org/43276 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7de328832c53ef40748c4e932b4340abf1ecf11 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

4 10

Change in vdsm[ovirt-3.5]: net: ignore bondingOptions in persistent networks.
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: ignore bondingOptions in persistent networks. ...................................................................... net: ignore bondingOptions in persistent networks. Up until https://gerrit.ovirt.org/#/c/42146/ bondingOptions were mistakenly part of persistent network attributes. So, if we are upgrading from an older enough version, we should drop this entry it the copied persistent networks. Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/43238/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index b8de93d..b5efff8 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -363,6 +363,11 @@ bond_attr.get('options')) bond_attr['options'] = self._netinfo.bondOptsForIfcfg( normalized_opts) + # before d18e2f10 bondingOptions were also part of networks, so in case + # we are upgrading from an older version, they should be ignored if + # they exist. + for net_attr in config_copy.networks.itervalues(): + net_attr.pop('bondingOptions', None) def _normalize_bonding_nics(self, config_copy): for bond_attr in config_copy.bonds.itervalues(): -- To view, visit https://gerrit.ovirt.org/43238 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c29d4e6c109d4fa7b2d293133b8551e423ec139 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

4 9

Change in vdsm[master]: net: tests: only test kernel config if unified persistence
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Hello Dan Kenigsberg, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/43499 to review the following change. Change subject: net: tests: only test kernel config if unified persistence ...................................................................... net: tests: only test kernel config if unified persistence Testing KernelConfig does not support ifcfg persistence. Change-Id: If7c360deea32f4514919eabee2284c34667b4a4e Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1203422 Reviewed-on: https://gerrit.ovirt.org/42964 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> Continuous-Integration: Dan Kenigsberg <danken(a)redhat.com> --- M tests/functional/networkTests.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/43499/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index f980feb..6ccd114 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -359,7 +359,9 @@ def setupNetworks(self, *args, **kwargs): test_kernel_config = kwargs.pop('test_kernel_config', True) status, msg = self.vdsm_net.setupNetworks(*args, **kwargs) - if test_kernel_config: + unified = ( + vdsm.config.config.get('vars', 'net_persistence') == 'unified') + if unified and test_kernel_config: self._assert_kernel_config_matches_running_config() return status, msg -- To view, visit https://gerrit.ovirt.org/43499 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7c360deea32f4514919eabee2284c34667b4a4e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>

4 6

Change in vdsm[master]: net: if all devices are up, skip ifup during restoratrion.
by ibarkan＠redhat.com 13 Jul '15

13 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: if all devices are up, skip ifup during restoratrion. ...................................................................... net: if all devices are up, skip ifup during restoratrion. The usual case since 3.5.4 is that all devices ahve ONBOOT=yes and are expected to be up during restoration. But if only some of them are down, it is better to be tedious and bring everything up with the right order. Change-Id: I9e97bea58be035e94ddd3a3a6c67132a2cbf1dc3 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/43435/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 2863507..fc16e78 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -133,7 +133,11 @@ """ for ifcfg_file in owned_ifcfg_files: _upgrade_onboot(ifcfg_file) - ifcfg.start_devices(owned_ifcfg_files) + down_links = _get_links_with_state_down( + [os.path.basename(name) for name in owned_ifcfg_files]) + if down_links: + logging.debug("Some of the devices are down (%s).", down_links) + ifcfg.start_devices(owned_ifcfg_files) def _upgrade_onboot(ifcfg_file): -- To view, visit https://gerrit.ovirt.org/43435 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e97bea58be035e94ddd3a3a6c67132a2cbf1dc3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 6

Change in vdsm[master]: resize-lun: resizePV parameters
by frolland＠redhat.com 13 Jul '15

13 Jul '15

Hello Fred Rolland, I'd like you to do a code review. Please visit https://gerrit.ovirt.org/42608 to review the following change. Change subject: resize-lun: resizePV parameters ...................................................................... resize-lun: resizePV parameters In lvm.resizePV, we need all devices names in the filters parameters. Otherwise the operation will fail. It is needed in case we have more than one LUN on the storage domain. Change-Id: I4213f82a0307dc91202078b53c0b2c2f24433899 Bug-Url:https://bugzilla.redhat.com/609689 Signed-off-by: Fred Rolland <frolland(a)redhat.com> --- M vdsm/storage/lvm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/42608/1 diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index f93e5b9..090dc14 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -877,7 +877,7 @@ """ pvName = _fqpvname(guid) cmd = ["pvresize", pvName] - rc, out, err = _lvminfo.cmd(cmd, (pvName,)) + rc, out, err = _lvminfo.cmd(cmd) if rc != 0: raise se.CouldNotResizePhysicalVolume(pvName, err) _lvminfo._invalidatepvs(pvName) -- To view, visit https://gerrit.ovirt.org/42608 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4213f82a0307dc91202078b53c0b2c2f24433899 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Fred Rolland <frolland(a)redhat.com>

6 19

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 12: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 12 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 13 Jul '15

13 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: Rate limit epoll errors on untracked FDs
by Vinzenz Feenstra 13 Jul '15

13 Jul '15

Vinzenz Feenstra has uploaded a new change for review. Change subject: virt: Rate limit epoll errors on untracked FDs ...................................................................... virt: Rate limit epoll errors on untracked FDs There seem to be moments, when epoll starts returning errors on file descriptors, which aren't any more tracked, so often, that we're running on 100% CPU in the vmchannels listener thread. To rate limit such conditions, this patch introduces a forced sleep of 5 seconds after every 10 of such errors and it will take down the whole process after 100 of such errors have occurred. Change-Id: I654e5b828e2c05e8a86fa0e945be67cec014c110 Bug-Url: https://bugzilla.redhat.com/1226911 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/virt/vmchannels.py 1 file changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/42569/1 diff --git a/vdsm/virt/vmchannels.py b/vdsm/virt/vmchannels.py index 61ffcd5..9939546 100644 --- a/vdsm/virt/vmchannels.py +++ b/vdsm/virt/vmchannels.py @@ -18,16 +18,26 @@ # Refer to the README and COPYING files for full details of the license # +import logging +import os +import select +import signal import threading import time -import select -import logging from storage.misc import NoIntrPoll # How many times a reconnect should be performed before a cooldown will be # applied COOLDOWN_RECONNECT_THRESHOLD = 5 + +# How long the thread should sleep, when the cool down limit for untracked +# errors has been reached +ERROR_RATE_LIMIT_SLEEP_TIME = 5 +# After how many errors the cooldown should be applied +UNTRACKED_ERROR_COOLDOWN_LIMIT = 10 +# After how many errors we should take down VDSM +UNTRACKED_ERROR_RESTART_LIMIT = 100 class Listener(threading.Thread): @@ -46,6 +56,7 @@ self._add_channels = {} self._del_channels = [] self._timeout = None + self._untrackedErrors = 0 def _handle_event(self, fileno, event): """ Handle an epoll event occurred on a specific file descriptor. """ @@ -55,6 +66,7 @@ if fileno in self._channels: reconnect = True else: + self._untrackedErrors += 1 self.log.debug("Received %.08X. On fd removed by epoll.", event) elif (event & select.EPOLLIN): @@ -167,6 +179,13 @@ events = NoIntrPoll(self._epoll.poll, 1) for (fileno, event) in events: self._handle_event(fileno, event) + if self._untrackedErrors > UNTRACKED_ERROR_RESTART_LIMIT: + self.log.critical("Too many epoll errors happened." + "Taking down process") + os.kill(os.getpid(), signal.SIGTERM) + elif (self._untrackedErrors > 0 and + self._untrackedErrors % UNTRACKED_ERROR_COOLDOWN_LIMIT == 0): + time.sleep(ERROR_RATE_LIMIT_SLEEP_TIME) else: self._update_channels() if (self._timeout is not None) and (self._timeout > 0): -- To view, visit https://gerrit.ovirt.org/42569 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I654e5b828e2c05e8a86fa0e945be67cec014c110 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 16

Change in vdsm[master]: adding StorageDomain.updateVmData()
by automation＠ovirt.org 12 Jul '15

12 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.updateVmData() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42930 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id79e7d6375e60216d1eb9a58e5a5c087db98625f Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.getBackedUpVmsInfo
by laravot＠redhat.com 12 Jul '15

12 Jul '15

Liron Aravot has uploaded a new change for review. Change subject: adding StorageDomain.getBackedUpVmsInfo ...................................................................... adding StorageDomain.getBackedUpVmsInfo This patch adds the StorageDomain.getBackedUpVmsInfo() verb which is used to get the OVF information from an export domain in a pool that operates without Spm. The old verb that was used in pool with Spm was StoragePool.getBackedUpVmsInfo() which was limited to the spm only because it supported to get OVF information from the master domain as well (the master_fs was mounted on the Spm). Change-Id: Ie2896897bccc493457695181436a55f688bb596f Signed-off-by: laravot(a)redhat.com <laravot(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py M vdsm/rpc/BindingXMLRPC.py M vdsm/rpc/vdsmapi-schema.json M vdsm/storage/hsm.py M vdsm/storage/sp.py 6 files changed, 73 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/42129/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 4b11181..c299811 100755 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -623,6 +623,15 @@ return dom['status']['code'], dom['status']['message'] return 0, '' + def getSDBackedUpVmsInfo(self, args): + spUUID = args[0] + sdUUID = args[1] + vmList = args[2] + dom = self.s.getBackedUpVmsInfo(spUUID, sdUUID, vmList) + if dom['status']['code']: + return dom['status']['code'], dom['status']['message'] + return 0, '' + def validateStorageDomain(self, args): sdUUID = args[0] dom = self.s.validateStorageDomain(sdUUID) @@ -2467,6 +2476,12 @@ ('<domain UUID> <descr>', 'Set storage domain description' )), + 'getStorageDomainBackedUpVmsInfo': (serv.getSDBackedUpVmsInfo, + ('<spUUID> <sdUUID>', + '[vmList](vmId1,vmId2,...)]' + 'Get list of VMs from the' + 'given backup domain' + )), 'validateStorageDomain': (serv.validateStorageDomain, ('<domain UUID>', 'Validate storage domain' diff --git a/vdsm/API.py b/vdsm/API.py index 20e5b30..f771f89 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1048,6 +1048,9 @@ def setDescription(self, description): return self._irs.setStorageDomainDescription(self._UUID, description) + def getBackedUpVmsInfo(self, storagepoolID, vmList): + return self._irs.getVmsInfo(storagepoolID, self._UUID, vmList) + def validate(self): return self._irs.validateStorageDomain(self._UUID) diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index 1735dba..cf12664 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -662,6 +662,10 @@ domain = API.StorageDomain(sdUUID) return domain.getImages() + def domainGetBackedUpVmsInfo(self, spUUID, sdUUID, vmList=None): + domain = API.StorageDomain(sdUUID) + return domain.getBackedUpVmsInfo(spUUID, vmList) + def domainGetInfo(self, sdUUID, options=None): domain = API.StorageDomain(sdUUID) return domain.getInfo() @@ -1084,7 +1088,8 @@ (self.domainAttachHsm, 'attachStorageDomainHsm'), (self.domainDetachHsm, 'detachStorageDomainHsm'), (self.domainDetachAnyStoragePoolHsm, - 'detachAnyStoragePoolHsm')) + 'detachAnyStoragePoolHsm'), + (self.domainGetBackedUpVmsInfo, 'getBackedUpVmsInfo')) def getIrsMethods(self): return ((self.domainActivate, 'activateStorageDomain'), diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 2eeefb4..221e0b5 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -4996,6 +4996,27 @@ 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID'}} ## +# @StorageDomain.getBackedUpVmsInfo: +# +# Get information about backed-up virtual machines from a backup domain. +# +# @storagepoolID: The UUID of the Storage Pool +# +# @storagedomainID: The UUID of the backup Storage Domain +# +# @vmList: Limit results to a list of VM UUIDs +# +# Returns: +# A dictionary of OVF information indexed by VM UUID +# +# Since: 4.18.0 +## +{'command': {'class': 'StorageDomain', 'name': 'getBackedUpVmsInfo'}, + 'data': {'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'vmList': ['UUID']}, + 'returns': 'OVFMap'} + +## # @StorageDomainCreateArgumentsBlock: # # Creation argument for Block-based Storage Domains. diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 5876646..621ea89 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -1513,6 +1513,30 @@ return dict(vmlist=vms) @public + def getBackedUpVmsInfo(self, spUUID, sdUUID, vmList=None): + """ + Gets a list of VMs with their info from the pool. + + * If 'sdUUID' is given and it's a backup domain then get the list of + VMs from it. + * If 'vmList' is given get info for these VMs only. + + :param spUUID: The UUID of the storage pool that you want to query. + :type spUUID: UUID + :param sdUUID: The UUID of the backup domain that the you want to + query or :keyword:`None`. + :type sdUUID: UUID + :param vmList: A UUID list of the VMs you want info on or + :keyword:`None` for all VMs in pool or backup domain. + :param options: ? + """ + pool = self.getPool(spUUID) + self.validateBackupDom(sdUUID) + vars.task.getSharedLock(STORAGE, sdUUID) + vms = pool.getVmsInfo(sdUUID, vmList) + return dict(vmlist=vms) + + @public def createVolume(self, sdUUID, spUUID, imgUUID, size, volFormat, preallocate, diskType, volUUID, desc, srcImgUUID=volume.BLANK_UUID, diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 3dcf343..eb79c3b 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1996,6 +1996,10 @@ return sdCache.produce(sdUUID).getVMsList() def getVmsInfo(self, sdUUID, vmList=None): + return self._getVmsInfo(sdUUID, vmList) + + @unsecured + def _getVmsInfo(self, sdUUID, vmList=None): self.validatePoolSD(sdUUID) return sdCache.produce(sdUUID).getVMsInfo(vmList=vmList) -- To view, visit https://gerrit.ovirt.org/42129 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2896897bccc493457695181436a55f688bb596f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com>

2 15

Change in vdsm[master]: adding StorageDomain.activateHsm()
by automation＠ovirt.org 12 Jul '15

12 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.activateHsm() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68eccd300b8ba0cc45b2485f978eb3ae367c16e2 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding the StorageDomain.upgradeVersion verb
by automation＠ovirt.org 12 Jul '15

12 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding the StorageDomain.upgradeVersion verb ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42478 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id8fb87c6e04e48072ec90d07a0f4c7a61411a808 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: adding StorageDomain.removeVmData()
by automation＠ovirt.org 12 Jul '15

12 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: adding StorageDomain.removeVmData() ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic53b19a43850341ee488b50fbb339fdf68c1a048 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: support strings for 'bridged' in kernelConfig
by ibarkan＠redhat.com 12 Jul '15

12 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: support strings for 'bridged' in kernelConfig ...................................................................... net: support strings for 'bridged' in kernelConfig Because kernelConfig did not know how to normalize this parameter in running config, _should_keep_bridged got wrong parameters if setupNetworks edited a network with 'bridged': 'false'. This resulted in a bridge being left behind after the network was removed. Change-Id: Ib6eb36e69c14c752712ed16d86ed5dd37007f7b7 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py M tests/functional/networkTests.py 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/43444/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index 6834cf5..5f10f24 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -328,9 +328,11 @@ def _normalize_bridge(self, config_copy): for net_attr in config_copy.networks.itervalues(): - if net_attr.get('bridged', True): + if utils.tobool(net_attr.get('bridged', True)): net_attr['bridged'] = True self._normalize_stp(net_attr) + else: + net_attr['bridged'] = False def _normalize_stp(self, net_attr): stp = net_attr.pop('stp', net_attr.pop('STP', None)) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 6e5f025..2520201 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1481,12 +1481,12 @@ with dummyIf(1) as nics: nic, = nics status, msg = self.setupNetworks( - {NETWORK_NAME: {'nic': nic, 'STP': 'no', 'bridged': True, + {NETWORK_NAME: {'nic': nic, 'STP': 'no', 'bridged': 'true', 'mtu': 1500}}, {}, NOCHK) self.assertEquals(status, SUCCESS, msg) bridge = ipwrapper.getLink(NETWORK_NAME) status, msg = self.setupNetworks( - {NETWORK_NAME: {'nic': nic, 'bridged': False, 'mtu': 1500}}, + {NETWORK_NAME: {'nic': nic, 'bridged': 'false', 'mtu': 1500}}, {}, NOCHK) self.assertEquals(status, SUCCESS, msg) self.assertNotIn( -- To view, visit https://gerrit.ovirt.org/43444 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6eb36e69c14c752712ed16d86ed5dd37007f7b7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 7

Change in vdsm[master]: net: restore-nets should support ONBOOT=no
by ibarkan＠redhat.com 12 Jul '15

12 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: restore-nets should support ONBOOT=no ...................................................................... net: restore-nets should support ONBOOT=no on 3.5.x devices were persisted with ONBOOT=no. Hence, the selective restoration would call setupNetworks with only a subset of the networks and create a partial running config. To fix this, we fix all ifcfg files to have ONBOOT=yes and verify all devices are up before computing what has changed since last call to setSafeNetworkConfig. This will make the following call to setupNetwork to merely update running config with the 'fixed' networks, if at all. NOTE: test is still WIP Change-Id: I6fa697942e6f26ee833d703437e84144c6de1334 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M tests/functional/networkTests.py M vdsm/vdsm-restore-net-config 2 files changed, 148 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/43339/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 5752c7e..5ea4304 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -19,6 +19,7 @@ from contextlib import contextmanager from functools import wraps import json +import re import netaddr import os.path @@ -1566,6 +1567,87 @@ self.assertBondDoesntExist(BOND_UNCHANGED, [nic_a]) @cleanupNet + def testSelectiveRestoreDuringUpgrade(self): + if vdsm.config.config.get('vars', 'net_persistence') == 'ifcfg': + raise SkipTest( + "with ifcfg persistence, vdsm-restore-net-config selective" + "restoration is not supported") + + BOND_UNCHANGED = 'bond100' + BOND_CHANGED = 'bond101' + IP_MGMT = '240.0.0.100' + MGMT_NET = NETWORK_NAME + '100' + NET_UNCHANGED = NETWORK_NAME + '101' + NET_CHANGED = NETWORK_NAME + '102' + IP_ADDR_UNCHANGED = '240.0.0.101' + IP_ADDR_CHANGED = '204.0.0.102' + nets = { + MGMT_NET: + {'bootproto': 'none', 'ipaddr': IP_MGMT, + 'netmask': IP_MASK, 'defaultRoute': True}, + NET_UNCHANGED: + {'bootproto': 'none', + 'ipaddr': IP_ADDR_UNCHANGED, + 'netmask': IP_MASK, 'bonding': BOND_UNCHANGED, + 'defaultRoute': False}, + NET_CHANGED: + {'bootproto': 'none', + 'ipaddr': IP_ADDR_CHANGED, + 'netmask': IP_MASK, 'bonding': BOND_CHANGED}, + } + + def _assert_all_nets_exist(): + self.vdsm_net.refreshNetinfo() + self.assertNetworkExists(MGMT_NET) + self.assertNetworkExists(NET_UNCHANGED) + self.assertNetworkExists(NET_CHANGED) + self.assertBondExists(BOND_UNCHANGED, [nic_b]) + self.assertBondExists(BOND_CHANGED, [nic_c]) + + with dummyIf(3) as nics: + nic_a, nic_b, nic_c = nics + nets[MGMT_NET]['nic'] = nic_a + bonds = {BOND_UNCHANGED: {'nics': [nic_b]}, + BOND_CHANGED: {'nics': [nic_c], 'options': "mode=4"} + } + status, msg = self.setupNetworks(nets, bonds, NOCHK) + self.assertEquals(status, SUCCESS, msg) + _assert_all_nets_exist() + try: + self.vdsm_net.save_config() + + for dev in (NET_UNCHANGED, BOND_UNCHANGED, nic_b, NET_CHANGED, + BOND_CHANGED, nic_c): + with open(NET_CONF_PREF + dev) as f: + content = f.read() + content = re.sub('ONBOOT=yes', 'ONBOOT=no', content) + if dev == BOND_CHANGED: + content = re.sub('mode=4', 'mode=3', content) + with open(NET_CONF_PREF + dev, 'w') as f: + f.write(content) + linkSet(dev, ['down']) + + RunningConfig().delete() + with nonChangingOperstate(MGMT_NET): + self.vdsm_net.restoreNetConfig() + + _assert_all_nets_exist() + finally: + self.setupNetworks( + {MGMT_NET: {'remove': True}, + NET_UNCHANGED: {'remove': True}, + NET_CHANGED: {'remove': True}}, + {BOND_CHANGED: {'remove': True}, + BOND_UNCHANGED: {'remove': True}}, + NOCHK) + self.vdsm_net.save_config() + self.assertNetworkDoesntExist(MGMT_NET) + self.assertNetworkDoesntExist(NET_UNCHANGED) + self.assertNetworkDoesntExist(NET_CHANGED) + self.assertBondDoesntExist(BOND_CHANGED, [nic_b]) + self.assertBondDoesntExist(BOND_UNCHANGED, [nic_a]) + + @cleanupNet @permutations([[True], [False]]) def testVolatileConfig(self, bridged): """ diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index ccb5294..81a2df0 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -19,9 +19,11 @@ # Refer to the README and COPYING files for full details of the license # import argparse +import glob import logging import logging.config import os +import re import threading import time import errno @@ -108,6 +110,11 @@ persistent_config = PersistentConfig() available_config = _filter_available(persistent_config) + + _verify_all_devices_are_up(list(_owned_ifcfg_files())) + + _update_running_config(persistent_config) + _wait_for_for_all_devices_up( available_config.networks.keys() + available_config.bonds.keys()) changed_config = _filter_changed_nets_bonds(available_config) @@ -118,6 +125,49 @@ logging.debug('Calling setupNetworks with networks (%s) ' 'and bond (%s).', nets, bonds) setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True) + + +def _verify_all_devices_are_up(owned_ifcfg_files): + """REQUIRED_FOR upgrade from ?<=vdsm<=4.16. + Were ifcfg files were created with ONBOOT=no. + """ + for ifcfg_file in owned_ifcfg_files: + _upgrade_onboot(ifcfg_file) + for device in ifcfg.sortDeviceIfcfgs(owned_ifcfg_files): + ifcfg.exec_ifup(device) + + +def _upgrade_onboot(ifcfg_file): + with open(ifcfg_file) as f: + content = f.read() + if not _onboot_ifcfg_content(content): + logging.debug("updating %s to ONBOOT=yes", ifcfg_file) + content = re.sub('ONBOOT=no', 'ONBOOT=yes', content) + with open(ifcfg_file, 'w') as f: + f.write(content) + + +def _update_running_config(persistent_config): + """We must recreate RunningConfig so that following setSafeNetworkConfig + will persist a valid configuration. + """ + running_config = RunningConfig() + for net, net_attr in persistent_config.networks.iteritems(): + running_config.setNetwork(net, net_attr) + for bonding, bonding_attr in persistent_config.bonds.iteritems(): + running_config.setBonding(bonding, bonding_attr) + running_config.save() + + +def _owned_ifcfg_files(): + for fpath in glob.iglob(netinfo.NET_CONF_DIR + '/*'): + if not os.path.isfile(fpath): + continue + + with open(fpath) as f: + content = f.read() + if _owned_ifcfg_content(content): + yield fpath def _remove_networks_in_running_config(): @@ -275,22 +325,27 @@ def _get_links_with_state_down(links): return set([l.name for l in ipwrapper.getLinks() if l.name in links and - _owned(l.name) and - _onboot(l.name) and + _owned_ifcfg(l.name) and + _onboot_ifcfg(l.name) and not l.oper_up]) -def _owned(link_name): - predicate = lambda content: ( - content.startswith('# Generated by VDSM version') or - content.startswith('# automatically generated by vdsm')) - return _ifcfg_predicate(link_name, predicate) +def _owned_ifcfg(link_name): + return _ifcfg_predicate(link_name, _owned_ifcfg_content) -def _onboot(link_name): - predicate = lambda content: any( - line == 'ONBOOT=yes' for line in content.splitlines()) - return _ifcfg_predicate(link_name, predicate) +def _onboot_ifcfg(link_name): + return _ifcfg_predicate(link_name, _onboot_ifcfg_content) + + +def _onboot_ifcfg_content(content): + return any(line == 'ONBOOT=yes' for line in content.splitlines()) + + +def _owned_ifcfg_content(content): + return content.startswith( + '# Generated by VDSM version') or content.startswith( + '# automatically generated by vdsm') def _ifcfg_predicate(link_name, predicate): -- To view, visit https://gerrit.ovirt.org/43339 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6fa697942e6f26ee833d703437e84144c6de1334 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 14

Change in vdsm[master]: net: flatten ifcfg.ConfigWriter
by ibarkan＠redhat.com 12 Jul '15

12 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: flatten ifcfg.ConfigWriter ...................................................................... net: flatten ifcfg.ConfigWriter make startDevices, sortDeviceIfcfgs, devType module level functions and make them public, for further use. exec_ifup was also made public for future use. stopDevices also joined for symmetry sake. Change-Id: I22676ee45dc7f4be7cd1b74f3f56305cc7e1a97a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/network/configurators/ifcfg.py 1 file changed, 56 insertions(+), 52 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/43338/1 diff --git a/vdsm/network/configurators/ifcfg.py b/vdsm/network/configurators/ifcfg.py index eeff599..b4b4cd7 100644 --- a/vdsm/network/configurators/ifcfg.py +++ b/vdsm/network/configurators/ifcfg.py @@ -151,12 +151,12 @@ if slave.name in nicsToAdd: ifdown(slave.name) # nics must be down to join a bond self.configApplier.addNic(slave) - _exec_ifup(slave.name) + exec_ifup(slave.name) if bondIfcfgWritten: ifdown(bond.name) _restore_default_bond_options(bond.name, bond.options) - _exec_ifup(bond.name) + exec_ifup(bond.name) if self.unifiedPersistence: self.runningConfig.setBonding( bond.name, {'options': bond.options, @@ -228,7 +228,7 @@ if to_be_removed: self.configApplier.removeNic(nic.name) if nic.name in netinfo.nics(): - _exec_ifup(nic.name) + exec_ifup(nic.name) else: logging.warning('host interface %s missing', nic.name) else: @@ -394,50 +394,6 @@ confFile.write(content) logging.info('Restored %s', confFilePath) - def _devType(self, content): - if re.search('^TYPE=Bridge$', content, re.MULTILINE): - return "Bridge" - elif re.search('^VLAN=yes$', content, re.MULTILINE): - return "Vlan" - elif re.search('^SLAVE=yes$', content, re.MULTILINE): - return "Slave" - else: - return "Other" - - def _sortDeviceIfcfgs(self, deviceIfcfgs): - devdict = {'Bridge': [], - 'Vlan': [], - 'Slave': [], - 'Other': []} - for confFile in deviceIfcfgs: - if not confFile.startswith(netinfo.NET_CONF_PREF): - continue - try: - with open(confFile) as f: - content = f.read() - except IOError as e: - if e.errno == os.errno.ENOENT: - continue - else: - raise - dev = confFile[len(netinfo.NET_CONF_PREF):] - - devdict[self._devType(content)].append(dev) - - return devdict['Other'] + devdict['Vlan'] + devdict['Bridge'] - - def _stopDevices(self, deviceIfcfgs): - for dev in reversed(deviceIfcfgs): - ifdown(dev) - - def _startDevices(self, deviceIfcfgs): - for dev in deviceIfcfgs: - try: - _exec_ifup(dev) - except ConfigNetworkError: - logging.error('Failed to ifup device %s during rollback.', dev, - exc_info=True) - @classmethod def _persistentBackup(cls, filename): """ Persistently backup ifcfg-* config files """ @@ -504,12 +460,12 @@ if not self._backups and not self._networksBackups: return - self._stopDevices(self._sortDeviceIfcfgs(self._backups.iterkeys())) + stopDevices(sortDeviceIfcfgs(self._backups.iterkeys())) self.restoreAtomicNetworkBackup() self.restoreAtomicBackup() - self._startDevices(self._sortDeviceIfcfgs(self._backups.iterkeys())) + startDevices(sortDeviceIfcfgs(self._backups.iterkeys())) @classmethod def clearBackups(cls): @@ -739,13 +695,61 @@ self.setIfaceMtu(slave, newmtu) +def stopDevices(deviceIfcfgs): + for dev in reversed(deviceIfcfgs): + ifdown(dev) + + +def startDevices(deviceIfcfgs): + for dev in deviceIfcfgs: + try: + exec_ifup(dev) + except ConfigNetworkError: + logging.error('Failed to ifup device %s during rollback.', dev, + exc_info=True) + + +def sortDeviceIfcfgs(deviceIfcfgs): + devdict = {'Bridge': [], + 'Vlan': [], + 'Slave': [], + 'Other': []} + for confFile in deviceIfcfgs: + if not confFile.startswith(netinfo.NET_CONF_PREF): + continue + try: + with open(confFile) as f: + content = f.read() + except IOError as e: + if e.errno == os.errno.ENOENT: + continue + else: + raise + dev = confFile[len(netinfo.NET_CONF_PREF):] + + devdict[devType(content)].append(dev) + + return devdict['Other'] + devdict['Vlan'] + devdict['Bridge'] + + +def devType(content): + if re.search('^TYPE=Bridge$', content, re.MULTILINE): + return "Bridge" + elif re.search('^VLAN=yes$', content, re.MULTILINE): + return "Vlan" + elif re.search('^SLAVE=yes$', content, re.MULTILINE): + return "Slave" + else: + return "Other" + + def ifdown(iface): "Bring down an interface" rc, _, _ = utils.execCmd([constants.EXT_IFDOWN, iface], raw=True) return rc -def _exec_ifup(iface_name, cgroup=dhclient.DHCLIENT_CGROUP): +def exec_ifup(iface_name, cgroup=dhclient.DHCLIENT_CGROUP): """Bring up an interface""" cmd = [constants.EXT_IFUP, iface_name] @@ -764,12 +768,12 @@ if not iface.blockingdhcp and (iface.ipv4.bootproto == 'dhcp' or iface.ipv6.dhcpv6): # wait for dhcp in another thread, so vdsm won't get stuck (BZ#498940) - t = threading.Thread(target=_exec_ifup, name='ifup-waiting-on-dhcp', + t = threading.Thread(target=exec_ifup, name='ifup-waiting-on-dhcp', args=(iface.name, cgroup)) t.daemon = True t.start() else: - _exec_ifup(iface.name, cgroup) + exec_ifup(iface.name, cgroup) def _restore_default_bond_options(bond_name, desired_options): -- To view, visit https://gerrit.ovirt.org/43338 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22676ee45dc7f4be7cd1b74f3f56305cc7e1a97a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 8

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 12 Jul '15

12 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 6: Verified+1 Tested with older engine that does not send frozen flag. -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: test
by ibarkan＠redhat.com 12 Jul '15

12 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: test ...................................................................... test Change-Id: I0f8bad149d12762ea6ae1fcf36dbdf1c241e277f Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M tests/functional/networkTests.py 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/43443/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 5752c7e..6e5f025 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1477,6 +1477,25 @@ self.assertEquals(status, SUCCESS, msg) @cleanupNet + def testRemovingBridgeDoesNotLeaveBridge(self): + with dummyIf(1) as nics: + nic, = nics + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'STP': 'no', 'bridged': True, + 'mtu': 1500}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + bridge = ipwrapper.getLink(NETWORK_NAME) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'bridged': False, 'mtu': 1500}}, + {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + self.assertNotIn( + bridge.name, (l.name for l in ipwrapper.getLinks())) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'remove': True}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + + @cleanupNet def testRestoreNetworksOnlyRestoreUnchangedDevices(self): if vdsm.config.config.get('vars', 'net_persistence') == 'ifcfg': raise SkipTest( -- To view, visit https://gerrit.ovirt.org/43443 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f8bad149d12762ea6ae1fcf36dbdf1c241e277f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

2 3

Change in vdsm[master]: net: support strings for 'bridged' in kernelConfig
by ibarkan＠redhat.com 12 Jul '15

12 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: support strings for 'bridged' in kernelConfig ...................................................................... net: support strings for 'bridged' in kernelConfig Because kernelConfig did not know how to normalize this parameter in running config, _should_keep_bridged got wrong parameters if setupNetworks edited a network with 'bridged': 'false'. This resulted in a bridge being left behind after the network was removed. Change-Id: Ib6eb36e69c14c752712ed16d86ed5dd37007f7b7 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> Change-Id: I9abdccf794ccc033200e006696ab16d52564fc4a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M lib/vdsm/netconfpersistence.py M tests/functional/networkTests.py 2 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/43445/1 diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py index 6834cf5..5f10f24 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/netconfpersistence.py @@ -328,9 +328,11 @@ def _normalize_bridge(self, config_copy): for net_attr in config_copy.networks.itervalues(): - if net_attr.get('bridged', True): + if utils.tobool(net_attr.get('bridged', True)): net_attr['bridged'] = True self._normalize_stp(net_attr) + else: + net_attr['bridged'] = False def _normalize_stp(self, net_attr): stp = net_attr.pop('stp', net_attr.pop('STP', None)) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 5752c7e..2520201 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1477,6 +1477,25 @@ self.assertEquals(status, SUCCESS, msg) @cleanupNet + def testRemovingBridgeDoesNotLeaveBridge(self): + with dummyIf(1) as nics: + nic, = nics + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'STP': 'no', 'bridged': 'true', + 'mtu': 1500}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + bridge = ipwrapper.getLink(NETWORK_NAME) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'nic': nic, 'bridged': 'false', 'mtu': 1500}}, + {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + self.assertNotIn( + bridge.name, (l.name for l in ipwrapper.getLinks())) + status, msg = self.setupNetworks( + {NETWORK_NAME: {'remove': True}}, {}, NOCHK) + self.assertEquals(status, SUCCESS, msg) + + @cleanupNet def testRestoreNetworksOnlyRestoreUnchangedDevices(self): if vdsm.config.config.get('vars', 'net_persistence') == 'ifcfg': raise SkipTest( -- To view, visit https://gerrit.ovirt.org/43445 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9abdccf794ccc033200e006696ab16d52564fc4a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

2 3

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 12 Jul '15

12 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: response: insert results into 'info'
by ykaplan＠redhat.com 12 Jul '15

12 Jul '15

Yeela Kaplan has uploaded a new change for review. Change subject: response: insert results into 'info' ...................................................................... response: insert results into 'info' Change-Id: Ib5284969585e55a230be31bde56956fc966e46c2 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M lib/vdsm/response.py 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/43236/1 diff --git a/lib/vdsm/response.py b/lib/vdsm/response.py index 7a04e93..db91bdc 100644 --- a/lib/vdsm/response.py +++ b/lib/vdsm/response.py @@ -25,11 +25,13 @@ def success(message=None, **kwargs): - kwargs["status"] = { - "code": doneCode["code"], - "message": message or doneCode["message"] + return { + 'info': kwargs, + 'status': { + "code": doneCode["code"], + "message": message or doneCode["message"], + }, } - return kwargs def error(name, message=None): -- To view, visit https://gerrit.ovirt.org/43236 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5284969585e55a230be31bde56956fc966e46c2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

3 12

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by fromani＠redhat.com 10 Jul '15

10 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 9: Code-Review-1 see inline comments from Michal -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: WIP: vm: drive: allow error policy fine tuning
by fromani＠redhat.com 10 Jul '15

10 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: WIP: vm: drive: allow error policy fine tuning ...................................................................... WIP: vm: drive: allow error policy fine tuning WORK IN PROGRESS Engine wants to permit fine-grained drive error policy, so this patch adds the missing bits in VDSM. Change-Id: I1b1234ab15fc87ad75dfeae197d058eec23accbc Related-To: https://bugzilla.redhat.com/1024428 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M tests/vmStorageTests.py M vdsm/rpc/vdsmapi-schema.json M vdsm/virt/vmdevices/storage.py 3 files changed, 78 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/38009/1 diff --git a/tests/vmStorageTests.py b/tests/vmStorageTests.py index 14b748f..f7e2b55 100644 --- a/tests/vmStorageTests.py +++ b/tests/vmStorageTests.py @@ -263,6 +263,41 @@ self.CAPACITY / constants.MEGAB) +@expandPermutations +class ErrorPolicyTests(VdsmTestCase): + + @permutations([['stop'], ['report'], ['ignore'], ['enospace']]) + def test_set_supported_policy(self, policy): + attrs = {} + conf = drive_config(errorPolicy=policy) + drive = Drive({}, self.log, **conf) + drive._setDriverAttrErrorPolicy(attrs) + self.assertEqual(attrs['error_policy'], policy) + + @permutations([[''], [None], [1], ['foobar']]) + def test_set_unsupported_policy(self, policy): + conf = drive_config(errorPolicy=policy) + drive = Drive({}, self.log, **conf) + self.assertRaises(ValueError, + drive._setDriverAttrErrorPolicy, + {}) + + def test_propagate_errors(self): + attrs = {} + # better explicit than implicit + conf = drive_config(propagateErrors='on') + drive = Drive({}, self.log, **conf) + drive._setDriverAttrErrorPolicy(attrs) + self.assertEqual(attrs['error_policy'], 'enospace') + + def test_not_propagate_errors(self): + attrs = {} + conf = drive_config(propagateErrors='off') + drive = Drive({}, self.log, **conf) + drive._setDriverAttrErrorPolicy(attrs) + self.assertEqual(attrs['error_policy'], 'stop') + + def drive_config(**kw): """ Reutrn drive configuration updated from **kw """ conf = { diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json index 1d919e8..aad20fe 100644 --- a/vdsm/rpc/vdsmapi-schema.json +++ b/vdsm/rpc/vdsmapi-schema.json @@ -2515,6 +2515,27 @@ {'type': 'VmSharedDriveType', 'union': ['bool', 'SharedDriveType']} + +## +# @VmDiskErrorPolicy: +# +# Specifies the behaviour of a VM in presence of +# errors from the disk drive. +# +# @stop: Pause the VM +# +# @report: Propagate the error to the Guest OS +# +# @ignore: Ignore the error +# +# @enospace: FIXME: find proper documentation +# +# Since: 4.17.0 +## +{'enum': 'VmDiskErrorPolicy', + 'data': ['stop', 'report', 'ignore', 'enospace']} + + ## # @VmDiskDevice: # @@ -2574,6 +2595,9 @@ # @baseVolumeID: #optional When used as a parameter to @VM.merge, indicates # the Volume that should become the new base volume # +# @errorPolicy: #optional Policy to adopt in presence of I/O error on +# this device (new in version 4.17.0) +# # Since: 4.10.0 ## {'type': 'VmDiskDevice', @@ -2587,7 +2611,7 @@ 'apparentsize': 'uint', 'index': 'int', 'name': 'str', 'optional': 'bool', 'shared': 'VmSharedDriveType', 'truesize': 'uint', 'volumeChain': ['VmDiskDeviceVolumeChainEntry'], - '*baseVolumeID': 'UUID'}} + '*baseVolumeID': 'UUID', '*errorPolicy': 'VmDiskErrorPolicy'}} ## # @VmInterfaceDeviceType: diff --git a/vdsm/virt/vmdevices/storage.py b/vdsm/virt/vmdevices/storage.py index d8a1def..a785970 100644 --- a/vdsm/virt/vmdevices/storage.py +++ b/vdsm/virt/vmdevices/storage.py @@ -46,7 +46,7 @@ 'index', 'name', 'optional', 'shared', 'truesize', 'volumeChain', 'baseVolumeID', 'serial', 'reqsize', 'cache', '_blockDev', 'extSharedState', 'drv', 'sgio', 'GUID', - 'diskReplicate') + 'diskReplicate', 'errorPolicy') VOLWM_CHUNK_MB = config.getint('irs', 'volume_utilization_chunk_mb') VOLWM_FREE_PCT = 100 - config.getint('irs', 'volume_utilization_percent') VOLWM_CHUNK_REPLICATE_MULT = 2 # Chunk multiplier during replication @@ -352,11 +352,8 @@ driverAttrs['cache'] = self.cache - if (self.propagateErrors == 'on' or - utils.tobool(self.propagateErrors)): - driverAttrs['error_policy'] = 'enospace' - else: - driverAttrs['error_policy'] = 'stop' + self._setDriverAttrErrorPolicy(driverAttrs) + diskelem.appendChildWithArgs('driver', **driverAttrs) if hasattr(self, 'specParams') and 'ioTune' in self.specParams: @@ -367,3 +364,18 @@ diskelem.appendChild(iotune) return diskelem + + def _setDriverAttrErrorPolicy(self, driverAttrs): + if hasattr(self, 'errorPolicy'): + if self.errorPolicy in ('stop', 'report', 'ignore', 'enospace'): + driverAttrs['error_policy'] = self.errorPolicy + else: + raise ValueError("unsupported Error Policy '%s", + self.errorPolicy) + else: + # backward compatibility + if (self.propagateErrors == 'on' or + utils.tobool(self.propagateErrors)): + driverAttrs['error_policy'] = 'enospace' + else: + driverAttrs['error_policy'] = 'stop' -- To view, visit http://gerrit.ovirt.org/38009 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b1234ab15fc87ad75dfeae197d058eec23accbc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

6 44

Change in vdsm[master]: vdsm: variable name change to avoid naming conflict
by mmirecki＠redhat.com 10 Jul '15

10 Jul '15

Marcin Mirecki has uploaded a new change for review. Change subject: vdsm: variable name change to avoid naming conflict ...................................................................... vdsm: variable name change to avoid naming conflict Changes: 'response' conflicts with respons.py for handling errors replaced by 'result' Change-Id: I6dce6b9e84edc347e64981b053d53de4091b7f6f Signed-off-by: mmirecki <mmirecki(a)redhat.com> Signed-off-by: Marcin Mirecki <mmirecki(a)redhat.com> --- M vdsm/API.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/43189/1 diff --git a/vdsm/API.py b/vdsm/API.py index 89f35ac..85d3340 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -571,10 +571,10 @@ self.log.debug('Migration create') params['vmId'] = self._UUID - response = self.create(params) - if response['status']['code']: + result = self.create(params) + if result['status']['code']: self.log.debug('Migration create - Failed') - return response + return result v = self._cif.vmContainer.get(self._UUID) @@ -583,7 +583,7 @@ self.log.debug('Destination VM creation succeeded') return {'status': doneCode, 'migrationPort': 0, - 'params': response['vmList']} + 'params': result['vmList']} def monitorCommand(self, command): """ -- To view, visit https://gerrit.ovirt.org/43189 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dce6b9e84edc347e64981b053d53de4091b7f6f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Marcin Mirecki <mmirecki(a)redhat.com>

4 14

Change in vdsm[master]: vdsm-reg: remove the sub-project
by Dan Kenigsberg 10 Jul '15

10 Jul '15

Dan Kenigsberg has posted comments on this change. Change subject: vdsm-reg: remove the sub-project ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.ovirt.org/#/c/43254/1/configure.ac File configure.ac: Line 331: AC_PATH_PROG([TAR_PATH], [tar], [/bin/tar]) Line 332: AC_PATH_PROG([TC_PATH], [tc], [/sbin/tc]) Line 333: AC_PATH_PROG([TEE_PATH], [tee], [/usr/bin/tee]) Line 334: AC_PATH_PROG([TOUCH_PATH], [touch], [/bin/touch]) Line 335: AC_PATH_PROG([TUNE2FS_PATH], [tune2fs], [/sbin/tune2fs]) please check which of -EX_CAT = '@CAT_PATH@' -EX_CHKCONFIG = '@CHKCONFIG_PATH@' -EX_DMIDECODE = '@DMIDECODE_PATH@' -EX_ECHO = '@ECHO_PATH@' -EX_GRUBBY = '@GRUBBY_PATH@' -EX_HWCLOCK = '@HWCLOCK_PATH@' -EX_NTPQ = '@NTPQ_PATH@' -EX_OPENSSL = '@OPENSSL_PATH@' -EX_REBOOT = '@REBOOT_PATH@' -EX_RPM = '@RPM_PATH@' -EX_SED = '@SED_PATH@' -EX_SERVICE = '@SERVICE_PATH@' -EX_SYSTEMCTL = '@SYSTEMCTL_PATH@' -EX_YUM = '@YUM_PATH@' can now be dropped from configure.ac Line 336: AC_PATH_PROG([UDEVADM_PATH], [udevadm], [/sbin/udevadm]) Line 337: AC_PATH_PROG([UMOUNT_PATH], [umount], [/bin/umount]) Line 338: AC_PATH_PROG([WGET_PATH], [wget], [/usr/bin/wget]) Line 339: AC_PATH_PROG([YUM_PATH], [yum], [/usr/bin/yum]) https://gerrit.ovirt.org/#/c/43254/1/vdsm_reg/Makefile.am File vdsm_reg/Makefile.am: Line 54 Line 55 Line 56 Line 57 Line 58 all dropped *.in files should be cleaned from .gitignore, too. https://gerrit.ovirt.org/#/c/43254/1/vdsm_reg/deployUtil.py.in File vdsm_reg/deployUtil.py.in: Line 85 Line 86 Line 87 Line 88 Line 89 vdsm/{add,del}Network can (and should) be dropped now. -- To view, visit https://gerrit.ovirt.org/43254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5d19ddb0e65657515e2dc0eb9eeae320d8d6bf71 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com> Gerrit-Reviewer: Fabian Deutsch <fabiand(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 11: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: add TODO to pyroute2 configurator
by phoracek＠redhat.com 10 Jul '15

10 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: net: add TODO to pyroute2 configurator ...................................................................... net: add TODO to pyroute2 configurator Track needed changes in TODO instead of untouched patches on gerrit. Change-Id: Idbfe663b6180654dba76d69ccc11ecbf14abff8f Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M vdsm/network/configurators/pyroute_two.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/43410/1 diff --git a/vdsm/network/configurators/pyroute_two.py b/vdsm/network/configurators/pyroute_two.py index c7730d3..6751c16 100644 --- a/vdsm/network/configurators/pyroute_two.py +++ b/vdsm/network/configurators/pyroute_two.py @@ -16,6 +16,10 @@ # # Refer to the README and COPYING files for full details of the license # +""" TODO +- use reuse=True when calling create() +- release() is deprecated, use close() instead +""" from __future__ import absolute_import import logging -- To view, visit https://gerrit.ovirt.org/43410 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbfe663b6180654dba76d69ccc11ecbf14abff8f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 5

Change in vdsm[master]: v2v: Add factory method for ImportVm class
by shavivi＠redhat.com 10 Jul '15

10 Jul '15

Shahar Havivi has uploaded a new change for review. Change subject: v2v: Add factory method for ImportVm class ...................................................................... v2v: Add factory method for ImportVm class Introducing factory methods for different import initialization sources: This patch set the from_libvirt() factory method, next patch will include from_files() and from_ova() factory methods Change-Id: I5689bc80d66499e1884344d80df127b513507ab7 Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M vdsm/v2v.py 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/42065/1 diff --git a/vdsm/v2v.py b/vdsm/v2v.py index b6763da..b7008fe 100644 --- a/vdsm/v2v.py +++ b/vdsm/v2v.py @@ -157,7 +157,7 @@ def convert_external_vm(uri, username, password, vminfo, job_id, irs): - job = ImportVm(uri, username, password, vminfo, job_id, irs) + job = ImportVm.from_libvirt(uri, username, password, vminfo, job_id, irs) job.start() _add_job(job_id, job) return {'status': doneCode} @@ -283,13 +283,14 @@ TERM_DELAY = 30 PROC_WAIT_TIMEOUT = 30 - def __init__(self, uri, username, password, vminfo, job_id, irs): - self._uri = uri - self._username = username - self._password = password + def __init__(self, vminfo, irs): + ''' + Don't use this constructor for initialization, + use the factory methods instead. + ''' self._vminfo = vminfo - self._id = job_id self._irs = irs + self._status = STATUS.STARTING self._description = '' self._disk_progress = 0 @@ -297,7 +298,15 @@ self._current_disk = 1 self._aborted = False self._prepared_volumes = [] + + @classmethod + def from_libvirt(self, uri, username, password, vminfo, job_id, irs): + self._uri = uri + self._username = username + self._password = password + self._id = job_id self._passwd_file = os.path.join(_V2V_DIR, "%s.tmp" % job_id) + return ImportVm(vminfo, irs) def start(self): t = threading.Thread(target=self._run) -- To view, visit https://gerrit.ovirt.org/42065 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5689bc80d66499e1884344d80df127b513507ab7 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>

4 12

Change in vdsm[master]: tests: moving heavy jsonrpc tests to integration dir
by Piotr Kliczewski 10 Jul '15

10 Jul '15

Piotr Kliczewski has uploaded a new change for review. Change subject: tests: moving heavy jsonrpc tests to integration dir ...................................................................... tests: moving heavy jsonrpc tests to integration dir Change-Id: If61a9f08ce73cf859c04d4ddf7840095ab7aae63 Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com> --- M configure.ac M tests/Makefile.am R tests/integration/jsonRpcHelper.py R tests/integration/jsonRpcTests.py M vdsm.spec.in 5 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/43306/1 diff --git a/configure.ac b/configure.ac index e8c6bcd..d116706 100644 --- a/configure.ac +++ b/configure.ac @@ -381,6 +381,7 @@ tests/devices/Makefile tests/devices/parsing/Makefile tests/devices/data/Makefile + tests/integration/Makefile vdsm-tool/Makefile vdsm/Makefile vdsm/gluster/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index b9b8e72..7ae8912 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS = \ functional \ devices \ + integration \ $(NULL) device_modules = \ @@ -56,8 +57,6 @@ iproute2Tests.py \ ipwrapperTests.py \ iscsiTests.py \ - jsonRpcHelper.py \ - jsonRpcTests.py \ libvirtconnectionTests.py \ lvmTests.py \ main.py \ diff --git a/tests/jsonRpcHelper.py b/tests/integration/jsonRpcHelper.py similarity index 100% rename from tests/jsonRpcHelper.py rename to tests/integration/jsonRpcHelper.py diff --git a/tests/jsonRpcTests.py b/tests/integration/jsonRpcTests.py similarity index 100% rename from tests/jsonRpcTests.py rename to tests/integration/jsonRpcTests.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 03bda86..966a974 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1131,6 +1131,7 @@ %dir %{_datadir}/%{vdsm_name}/tests %dir %{_datadir}/%{vdsm_name}/tests/functional %dir %{_datadir}/%{vdsm_name}/tests/devices +%dir %{_datadir}/%{vdsm_name}/tests/integration %{_datadir}/%{vdsm_name}/tests/*.py* %{_datadir}/%{vdsm_name}/tests/cpu_info.out %{_datadir}/%{vdsm_name}/tests/caps_libvirt_intel_E5649.out @@ -1174,6 +1175,7 @@ %{_datadir}/%{vdsm_name}/tests/glusterVolumeTasks.xml %{_datadir}/%{vdsm_name}/tests/functional/*.py* %{_datadir}/%{vdsm_name}/tests/functional/*.policy +%{_datadir}/%{vdsm_name}/tests/integration/*.py* %files hook-openstacknet %defattr(-, root, root, -) -- To view, visit https://gerrit.ovirt.org/43306 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If61a9f08ce73cf859c04d4ddf7840095ab7aae63 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>

6 18

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 10: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by fromani＠redhat.com 10 Jul '15

10 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 8: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/43289/8/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 331: self._guestSocketFile = self._makeChannelPath(_VMCHANNEL_DEVICE_NAME) Line 332: self._qemuguestSocketFile = self._makeChannelPath(_QEMU_GA_DEVICE_NAME) Line 333: self.guestAgent = guestagent.GuestAgent( Line 334: self._guestSocketFile, self.cif.channelListener, self.log, Line 335: self._onGuestStatusChange) Malicious guest can (try to) DoS VDSM or Engine. The current Vm._evaluatedStatus offers some protection. Do we need to re-introduce it in later patches? see https://gerrit.ovirt.org/#/c/43414 Line 336: self._domain = DomainDescriptor.from_id(self.id) Line 337: self._released = False Line 338: self._releaseLock = threading.Lock() Line 339: self.saveState() -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 9: * 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 10 Jul '15

10 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: pyroute2: reuse created devices
by phoracek＠redhat.com 10 Jul '15

10 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: pyroute2: reuse created devices ...................................................................... pyroute2: reuse created devices When we try to create new device over existing one, pyroute2 raises exception, while other configurators doesn't. Now, if we try to create device which already exists, pyroute2 just return existing device with no complains. Change-Id: Ief8c2ad9e9a1a7369e4e81495daa3e31e613b5e5 Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M vdsm/network/configurators/pyroute_two.py 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/34197/1 diff --git a/vdsm/network/configurators/pyroute_two.py b/vdsm/network/configurators/pyroute_two.py index 59050e3..4986c12 100644 --- a/vdsm/network/configurators/pyroute_two.py +++ b/vdsm/network/configurators/pyroute_two.py @@ -108,7 +108,7 @@ self.ifup(iface) def addBridge(self, bridge): - self.ip.create(kind='bridge', ifname=bridge.name).commit() + self.ip.create(kind='bridge', ifname=bridge.name, reuse=True).commit() def addBridgePort(self, bridge): with self.ip.interfaces[bridge.name] as i: @@ -124,8 +124,8 @@ def addVlan(self, vlan): link = self.ip.interfaces[vlan.device.name].index - self.ip.create(kind='vlan', ifname=vlan.name, - link=link, vlan_id=vlan.tag).commit() + self.ip.create(kind='vlan', ifname=vlan.name, link=link, + vlan_id=vlan.tag, reuse=True).commit() def removeVlan(self, vlan): with self.ip.interfaces[vlan.name] as i: @@ -133,7 +133,7 @@ def addBond(self, bond): if bond.name not in netinfo.bondings(): - self.ip.create(kind='bond', ifname=bond.name).commit() + self.ip.create(kind='bond', ifname=bond.name, reuse=True).commit() def removeBond(self, bond): with self.ip.interfaces[bond.name] as i: -- To view, visit http://gerrit.ovirt.org/34197 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief8c2ad9e9a1a7369e4e81495daa3e31e613b5e5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 4

Change in vdsm[master]: pyroute2: release() is deprecated
by phoracek＠redhat.com 10 Jul '15

10 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: pyroute2: release() is deprecated ...................................................................... pyroute2: release() is deprecated release() method is deprecated, use close() instead. Change-Id: Idbfe663b6180654dba76d69ccc11ecbf14abff8e Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M vdsm/network/configurators/pyroute_two.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/34199/1 diff --git a/vdsm/network/configurators/pyroute_two.py b/vdsm/network/configurators/pyroute_two.py index 08df1c4..1e41266 100644 --- a/vdsm/network/configurators/pyroute_two.py +++ b/vdsm/network/configurators/pyroute_two.py @@ -164,4 +164,4 @@ libvirt.removeNetwork(network) def releaseSocket(self): - self.ip.release() + self.ip.close() -- To view, visit http://gerrit.ovirt.org/34199 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbfe663b6180654dba76d69ccc11ecbf14abff8e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

3 4

Change in vdsm[master]: networkTests: setupNetworksAddBondWithManyVlans bond not found
by phoracek＠redhat.com 10 Jul '15

10 Jul '15

Petr Horáček has uploaded a new change for review. Change subject: networkTests: setupNetworksAddBondWithManyVlans bond not found ...................................................................... networkTests: setupNetworksAddBondWithManyVlans bond not found testSetupNetworksAddBondWithManyVlans always fails on Jenkins with 'bond0.0' not found in ...' error (http://jenkins.ovirt.org/job/vdsm_master_network_functional_ tests_gerrit/1837/testReport/junit/networkTests/NetworkTest/ testSetupNetworksAddBondWithManyVlans_kwargs_False_/) Change-Id: Iccd0ba18ac223a63c6633ee64772cfe6998288b1 Signed-off-by: Petr Horáček <phoracek(a)redhat.com> --- M tests/functional/networkTests.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/31855/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index ed45b2a..581400b 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -294,6 +294,8 @@ @ValidateRunningAsRoot def testSetupNetworksAddBondWithManyVlans(self, bridged): def assertDevStatsReported(): + # import time + # time.sleep(1) status, msg, hostStats = self.vdsm_net.getVdsStats() self.assertEqual(status, SUCCESS, msg) self.assertIn('network', hostStats) -- To view, visit http://gerrit.ovirt.org/31855 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iccd0ba18ac223a63c6633ee64772cfe6998288b1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>

4 13

Change in vdsm[master]: vm: event: send status event on IO Error
by fromani＠redhat.com 10 Jul '15

10 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 6: (1 comment) https://gerrit.ovirt.org/#/c/43312/6/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 3615: if not self.extendDrivesIfNeeded(): Line 3616: self.log.info("No VM drives were extended") Line 3617: Line 3618: # we need new disk stats Line 3619: self.send_status_event(**self._getRunningVmStats()) > where/when do we need them? good point(s). My reasoning was that after the resize, it is worth to send back immediately updated disk stats. But indeed need to check how much it takes. Line 3620: Line 3621: elif action == libvirt.VIR_DOMAIN_EVENT_IO_ERROR_REPORT: Line 3622: self.log.info('I/O error %s device %s reported to guest OS', Line 3623: err, blockDevAlias) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by fromani＠redhat.com 10 Jul '15

10 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 8: We can try sending all the stats. -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: tcTest: skip tests if somehow same bridge name is reused
by Dan Kenigsberg 09 Jul '15

09 Jul '15

Dan Kenigsberg has uploaded a new change for review. Change subject: tcTest: skip tests if somehow same bridge name is reused ...................................................................... tcTest: skip tests if somehow same bridge name is reused My commit 61fff86c did not solve the problem of tests magically re-drawing the same bridge name as a formerly-started test. There is no need to mark these jobs as failure, as the problem is not in our code but in our broken test. Change-Id: Id678882d68976618360bcce76f16837d67e274ea Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/tcTests.py 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/41898/1 diff --git a/tests/tcTests.py b/tests/tcTests.py index cbc7faa..49ad6f2 100644 --- a/tests/tcTests.py +++ b/tests/tcTests.py @@ -78,7 +78,14 @@ class _Bridge(_Interface): def addDevice(self): - check_call([EXT_BRCTL, 'addbr', self.devName]) + try: + check_call([EXT_BRCTL, 'addbr', self.devName]) + except RuntimeError as e: + if 'can\'t create bridge with the same name' in e.message: + raise SkipTest(e.message) + else: + raise + # learning interval is different on different kernels, so set it # explicit for 2.x kernels if os.uname()[2].startswith("2"): -- To view, visit https://gerrit.ovirt.org/41898 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id678882d68976618360bcce76f16837d67e274ea Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

5 20

Change in vdsm[master]: net: remove dead code from vdsm-restore-net-config
by ibarkan＠redhat.com 09 Jul '15

09 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: remove dead code from vdsm-restore-net-config ...................................................................... net: remove dead code from vdsm-restore-net-config Change-Id: I62ea3abdae6f9dade29266228a8f25df94f8ea23 Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/43300/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 7296dfa..ccb5294 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -22,7 +22,6 @@ import logging import logging.config import os -import sys import threading import time import errno @@ -41,9 +40,7 @@ # Unified persistence restoration from network.api import setupNetworks, change_numvfs -from network import configurators -import pkgutil _ALL_DEVICES_UP_TIMEOUT = 5 @@ -307,18 +304,6 @@ raise else: return predicate(content) - - -def _get_all_configurators(): - """Returns the class objects of all the configurators in the netconf pkg""" - prefix = configurators.__name__ + '.' - for importer, moduleName, isPackage in pkgutil.iter_modules( - configurators.__path__, prefix): - __import__(moduleName, fromlist="_") - - for cls in configurators.Configurator.__subclasses__(): - if sys.modules[cls.__module__].is_available(): - yield cls def _nets_already_restored(nets_restored_mark): -- To view, visit https://gerrit.ovirt.org/43300 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62ea3abdae6f9dade29266228a8f25df94f8ea23 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 7

Change in vdsm[master]: net: wait for restored devices to be up
by ibarkan＠redhat.com 09 Jul '15

09 Jul '15

Ido Barkan has uploaded a new change for review. Change subject: net: wait for restored devices to be up ...................................................................... net: wait for restored devices to be up If restore-net-config does not wait for all devices to be up, it might observe a transient kernel state where, for example, bonding devices might report no slaves. This makes restoration re-restore a bond because it is reported by the kernel as different from the persisted device. Change-Id: I3cd3de577e5d0bcf5e87c4894e94e03c209ce76a Signed-off-by: Ido Barkan <ibarkan(a)redhat.com> --- M vdsm/vdsm-restore-net-config 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/43209/1 diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index bec5c87..4dc7012 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -26,10 +26,12 @@ import threading from vdsm.config import config +from vdsm import ipwrapper from vdsm import netinfo from vdsm.constants import P_VDSM_RUN from vdsm.netconfpersistence import RunningConfig, PersistentConfig, \ KernelConfig, CONF_PERSIST_DIR, BaseConfig +from vdsm.netlink.monitor import Monitor import hostdev # Ifcfg persistence restoration @@ -40,6 +42,8 @@ from network import configurators import pkgutil + +_ALL_DEVICES_UP_TIMEOUT = 30 _NETS_RESTORED_MARK = os.path.join(P_VDSM_RUN, 'nets_restored') _VIRTUAL_FUNCTIONS_PATH = os.path.join(CONF_PERSIST_DIR, 'virtual_functions') @@ -109,6 +113,7 @@ nets = changed_config.networks bonds = changed_config.bonds if nets or bonds: + _wait_for_for_all_devices_up(nets.keys() + bonds.keys()) _convert_to_blocking_dhcp(nets) logging.debug('Calling setupNetworks with networks (%s) ' 'and bond (%s).', nets, bonds) @@ -248,6 +253,25 @@ return available_bonds +def _wait_for_for_all_devices_up(links): + down_links = set([l for l in ipwrapper.getLinks() if + l.name in links and not l.oper_up]) + + if not down_links: + logging.debug("all devices are up.") + return + + logging.debug("waiting for %s to be up.", down_links) + monitor = Monitor(('link',), timeout=_ALL_DEVICES_UP_TIMEOUT, + silent_timeout=True) + monitor.start() + for event in monitor: + if event['state'] == netinfo.OPERSTATE_UP: + down_links.discard(event['name']) + if not down_links: + break + + def _get_all_configurators(): """Returns the class objects of all the configurators in the netconf pkg""" prefix = configurators.__name__ + '.' -- To view, visit https://gerrit.ovirt.org/43209 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cd3de577e5d0bcf5e87c4894e94e03c209ce76a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com>

3 25

Change in vdsm[master]: virt: clientif: remove generic vm status event
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 8: looks ok running stats is the best bet I suppose. In future we should send everything so engine can drop the subsequent poll call -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 6: (1 comment) not sure, should be tested. no harm if we dont' send it (we can skip some quick pause/extend/unpause cases, but that shouldn't matter) https://gerrit.ovirt.org/#/c/43312/6/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 3615: if not self.extendDrivesIfNeeded(): Line 3616: self.log.info("No VM drives were extended") Line 3617: Line 3618: # we need new disk stats Line 3619: self.send_status_event(**self._getRunningVmStats()) where/when do we need them? does "the extend function take a long time? if so perhaps better to send event beforehand? and then on resume it is already handled? Line 3620: Line 3621: elif action == libvirt.VIR_DOMAIN_EVENT_IO_ERROR_REPORT: Line 3622: self.log.info('I/O error %s device %s reported to guest OS', Line 3623: err, blockDevAlias) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 5: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Abandoned abandoned as planned. We don't really need this patch. -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 5: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: virt: events: extract function to make event info ...................................................................... Abandoned abandoned as planned. We don't really need this patch. -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 5: Code-Review-1 -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: introduce _send_event helper
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 5: unneeded, same as 43268. drop one of them. -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... Patch Set 5: Code-Review-1 unneeded flexibility^Wcomplexity. Just add arguments to send_status_event -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 2: (3 comments) https://gerrit.ovirt.org/#/c/43270/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 1308: exitMessage, exitReasonCode) Line 1309: # DoubleDownError is protecting us here Line 1310: event_data = self._getExitedVmStats() Line 1311: except DoubleDownError: Line 1312: event_data = {} > I don't think so. it raises when another lastStatus = DOWN happens...which yep, will remove before the verification Line 1313: pass Line 1314: try: Line 1315: self.guestAgent.stop() Line 1316: except Exception: Line 1316: except Exception: Line 1317: pass Line 1318: self.saveState() Line 1319: if event_data: Line 1320: self._send_event( > too long for a single line? it should fit and probably end up better looking Line 1321: vmstatus.DOWN, Line 1322: **event_data Line 1323: ) Line 1324: Line 1367: def _getExitedVmStats(self): Line 1368: stats = { Line 1369: 'exitCode': self.conf['exitCode'], Line 1370: 'exitMessage': self.conf['exitMessage'], Line 1371: 'exitReason': self.conf['exitReason'] > whitespace or I just don't understand gerrit diff? I changed the positioning of closing brace '}'. Unneeded change indeed. Line 1372: } Line 1373: if 'timeOffset' in self.conf: Line 1374: stats['timeOffset'] = self.conf['timeOffset'] Line 1375: return stats -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/43269/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 775: self.recovering = False Line 776: self.saveState() Line 777: Line 778: self._send_event( Line 779: self._getVmStatus(), > I wonder... Sorry, this was lost in rebase fest. I had the same doubt. I choosed the state we see because of the guest agent delay (see _getVmStauts and _getVmStatusFromGuest). I was concerned of sending 'Up' too early, and this seemed a bit safer, and helped to keep the patch(set) minimal. It is open to discussion, of course. Line 780: **self._getRunningVmStats() Line 781: ) Line 782: Line 783: except MissingLibvirtDomainError as e: -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: add minimal running stats to status
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: add minimal running stats to status ...................................................................... Patch Set 4: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: add minimal running stats to status
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: vm: event: add minimal running stats to status ...................................................................... Abandoned better not send data we're not 100% sure Engine could benefit from. -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: vm: extract cheap subset of running vm stats
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: extract cheap subset of running vm stats ...................................................................... vm: extract cheap subset of running vm stats The getRunningVmStats() method does a lot of work an fetches all the stats related to a running VMs. This involves fetching data from periodic tasks, sanitizing all the data and so forth. There is an subset of this data which it is easy and cheap to gather, and yet it contains useful information from Engine. This patch extracts this subset and moves it in a separate function, to be used both by old code and from a new event. Change-Id: Ia3e2c19d0b69e78f463976478ded12f306e2f2c7 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/43285/2 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index bed6b7e..770435b 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1364,21 +1364,29 @@ stats['boot'] = self.conf['boot'] return stats - def _getRunningVmStats(self): - """ - gathers all the stats which can change while a VM is running. - """ + def _getUpVmStats(self): stats = { 'elapsedTime': str(int(time.time() - self._startTime)), 'monitorResponse': str(self._monitorResponse), 'timeOffset': self.conf.get('timeOffset', '0'), 'clientIp': self.conf.get('clientIp', ''), - 'network': {}, - 'disks': {}} + } if 'pauseCode' in self.conf: stats['pauseCode'] = self.conf['pauseCode'] + if self._watchdogEvent: + stats['watchdogEvent'] = self._watchdogEvent if self.isMigrating(): stats['migrationProgress'] = self.migrateStatus()['progress'] + return stats + + def _getRunningVmStats(self): + """ + gathers all the stats which can change while a VM is running. + """ + stats = self._getUpVmStats() + + stats['network'] = {} + stats['disks'] = {} decStats = {} try: @@ -1414,8 +1422,6 @@ stats.update(self._getGraphicsStats()) stats['hash'] = self._getVmStatusHash() - if self._watchdogEvent: - stats['watchdogEvent'] = self._watchdogEvent if self._numaInfo: stats['vNodeRuntimeInfo'] = self._numaInfo if self._vcpuLimit: -- To view, visit https://gerrit.ovirt.org/43285 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3e2c19d0b69e78f463976478ded12f306e2f2c7 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

2 7

Change in vdsm[master]: vm: factor out the vm hashes
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: factor out the vm hashes ...................................................................... vm: factor out the vm hashes Extracts the code which reports the devices and guest hashes in a single, shared and simple helper. Change-Id: Id05143021d505e815abbd227f58f460cf9b45210 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/43286/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 5266b71..7cc4d0b 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -386,8 +386,7 @@ self._evaluatedStatus = vm_status current_status = self.lastStatus stats['status'] = vm_status, - stats['hash'] = str(hash((self._domain.devices_hash, - self.guestAgent.diskMappingHash))) + stats['hash'] = self._getVmStatusHash() # TODO: DOWN and exitCode must be set atomically. Once this is # done we can remove the multiple conditions from this code. @@ -403,6 +402,10 @@ self.log.debug('Last status %s and evaluated status %s', current_status, vm_status) self._notify('VM_status', stats) + + def _getVmStatusHash(self): + return str(hash((self._domain.devices_hash, + self.guestAgent.diskMappingHash))) def _notify(self, operation, params): sub_id = '|virt|%s|%s' % (operation, self.id) @@ -1415,8 +1418,8 @@ self.log.exception("Error setting vm disk stats") stats.update(self._getGraphicsStats()) - stats['hash'] = str(hash((self._domain.devices_hash, - self.guestAgent.diskMappingHash))) + stats['hash'] = self._getVmStatusHash() + if self._watchdogEvent: stats['watchdogEvent'] = self._watchdogEvent if self._numaInfo: -- To view, visit https://gerrit.ovirt.org/43286 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id05143021d505e815abbd227f58f460cf9b45210 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

5 9

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on RTC update
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on RTC update ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on RTC update
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: vm: event: send status event on RTC update ...................................................................... Abandoned abandoned as requested. No need now. -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... Abandoned abandoned as requested. No need now. -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... Patch Set 3: (1 comment) setDownStatus should be enough. other events we don't really care about https://gerrit.ovirt.org/#/c/43313/3/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 4487: elif (detail == libvirt.VIR_DOMAIN_EVENT_RESUMED_MIGRATED and Line 4488: self.lastStatus == vmstatus.MIGRATION_DESTINATION): Line 4489: self._incomingMigrationFinished.set() Line 4490: Line 4491: self.send_status_event() u Line 4492: Line 4493: def _updateDevicesDomxmlCache(self, xml): Line 4494: """ Line 4495: Devices cache their device's XML, which is used for per-device -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... Patch Set 3: * Update tracker::IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has abandoned this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... Abandoned no need for safety net. We either want precise events or no events at all. -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... Patch Set 3: Code-Review-1 I wouldn't bother right now. Bigger problem is that we don't update lastStatus nor guestCPURunning That should be fixed first, but out of scope right now -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on RTC update
by michal.skrivanek＠redhat.com 09 Jul '15

09 Jul '15

Michal Skrivanek has posted comments on this change. Change subject: vm: event: send status event on RTC update ...................................................................... Patch Set 3: Code-Review-1 no need for events on RTC change, we don't use it anymore eanyway -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-3.5]: DONTMERGE: bench-only: fake MOM.
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: DONTMERGE: bench-only: fake MOM. ...................................................................... DONTMERGE: bench-only: fake MOM. Let's pretend MOM is not in the VDSM process. This patch is posted on gerrit only for easier sharing. Should never be merged. Change-Id: I005ba3687d70dcb237658c55cc52cda643433463 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/config.py.in M vdsm/clientIF.py M vdsm/momIF.py 3 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/40907/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index 944aaa8..0f1b0c9 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -228,6 +228,9 @@ ('transient_disks_repository', '@VDSMLIBDIR@/transient', 'Local path to the transient disks repository.'), + + ('fake_mom', 'false', + 'Fakes MOM. Use ONLY for benchmark/development purposes!'), ]), # Section: [ksm] diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 3678f9d..0e426f9 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -29,7 +29,7 @@ import alignmentScan from vdsm.config import config import ksm -from momIF import MomThread, isMomAvailable +from momIF import MomThread, isMomAvailable, FakeMom from vdsm.compat import pickle from vdsm.define import doneCode, errCode import libvirt @@ -206,7 +206,11 @@ def _prepareMOM(self): momconf = config.get("mom", "conf") - if isMomAvailable(): + if config.getboolean('vars', 'fake_mom'): + self.log.warn("MOM initialization WILL BE FAKED!!! " + "DO NOT USE IN PRODUCTION ENVIRONMENT!!!") + self.mom = FakeMom(momconf) + elif isMomAvailable(): try: self.mom = MomThread(momconf) return diff --git a/vdsm/momIF.py b/vdsm/momIF.py index a2088ef..476f70e 100644 --- a/vdsm/momIF.py +++ b/vdsm/momIF.py @@ -96,3 +96,37 @@ return 'active' else: return 'inactive' + + +class FakeMom(object): + + def __init__(self, momconf): + self.log = logging.getLogger("MOM") + self.log.info("Faking up MOM") + self._conf = momconf + + def getKsmStats(self): + """ + Get information about KSM and convert memory data from page + based values to MiB. + """ + ret = {} + ret['ksmState'] = False + ret['ksmPages'] = 0 + ret['memShared'] = 0 + ret['memShared'] = 0 + ret['ksmCpu'] = 0 + return ret + + def setPolicy(self, policyStr): + # mom.setPolicy will raise an exception on failure. + pass + + def setPolicyParameters(self, key_value_store): + pass + + def stop(self): + self.log.info("Shutting down Faked MOM") + + def getStatus(self): + return 'inactive' -- To view, visit https://gerrit.ovirt.org/40907 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I005ba3687d70dcb237658c55cc52cda643433463 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 3

Change in vdsm[master]: sampling: move cpu usage computations into helper
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: move cpu usage computations into helper ...................................................................... sampling: move cpu usage computations into helper Factor out repeated cpu usage computations (user, sys, nice) into helper functions, to reduce duplications Change-Id: I9cc7c89667321cc5150f059430cf8b8cb3db18a0 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 26 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/41252/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 65f1a98..35112cb 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -606,17 +606,18 @@ return stats hs0, hs1 = self._samples[0], self._samples[-1] interval = hs1.timestamp - hs0.timestamp - jiffies = (hs1.pidcpu.user - hs0.pidcpu.user) % (2 ** 32) - stats['cpuUserVdsmd'] = jiffies / interval - jiffies = (hs1.pidcpu.sys - hs0.pidcpu.sys) % (2 ** 32) - stats['cpuSysVdsmd'] = jiffies / interval - jiffies = (hs1.totcpu.user - hs0.totcpu.user) % (2 ** 32) - stats['cpuUser'] = jiffies / interval / self._ncpus - jiffies = (hs1.totcpu.sys - hs0.totcpu.sys) % (2 ** 32) - stats['cpuSys'] = jiffies / interval / self._ncpus - stats['cpuIdle'] = max(0.0, - 100.0 - stats['cpuUser'] - stats['cpuSys']) + stats['cpuUserVdsmd'] = _compute_cpu_usage( + hs0.pidcpu.user, hs1.pidcpu.user, interval) + stats['cpuSysVdsmd'] = _compute_cpu_usage( + hs0.pidcpu.sys, hs1.pidcpu.sys, interval) + + stats['cpuUser'] = _compute_cpu_usage( + hs0.totcpu.user, hs1.totcpu.user, interval, self._ncpus) + stats['cpuSys'] = _compute_cpu_usage( + hs0.totcpu.sys, hs1.totcpu.sys, interval, self._ncpus) + + stats['cpuIdle'] = _compute_cpu_idle(stats) stats['memUsed'] = hs1.memUsed stats['anonHugePages'] = hs1.anonHugePages stats['cpuLoad'] = hs1.cpuLoad @@ -651,16 +652,14 @@ sample0 = hs0.cpuCores.get(cpuCore) sample1 = hs1.cpuCores.get(cpuCore) - jiffies = (sample1.user - sample0.user) % (2 ** 32) - coreStat['cpuUser'] = ("%.2f" % (jiffies / interval)) + coreStat['cpuUser'] = "%.2f" % ( + _compute_cpu_usage(sample0.user, sample1.user, interval)) - jiffies = (sample1.sys - sample0.sys) % (2 ** 32) - coreStat['cpuSys'] = ("%.2f" % (jiffies / interval)) + coreStat['cpuSys'] = "%.2f" % ( + _compute_cpu_usage(sample0.sys, sample1.sys, interval)) - coreStat['cpuIdle'] = ("%.2f" % - max(0.0, 100.0 - - float(coreStat['cpuUser']) - - float(coreStat['cpuSys']))) + coreStat['cpuIdle'] = "%.2f" % ( + _compute_cpu_idle(coreStat)) cpuCoreStats[str(cpuCore)] = coreStat return cpuCoreStats @@ -741,6 +740,15 @@ return stats +def _compute_cpu_usage(first_cpu_value, last_cpu_value, interval, ncpus=1.): + jiffies = (last_cpu_value - first_cpu_value) % (2 ** 32) + return jiffies / interval / ncpus + + +def _compute_cpu_idle(cpu_stats): + return max(0.0, 100.0 - cpu_stats['cpuUser'] - cpu_stats['cpuSys']) + + def _getLinkSpeed(dev): if dev.isNIC(): speed = netinfo.nicSpeed(dev.name) -- To view, visit https://gerrit.ovirt.org/41252 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cc7c89667321cc5150f059430cf8b8cb3db18a0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 4

Change in vdsm[master]: sampling: simplify CpuCoreSample
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: simplify CpuCoreSample ...................................................................... sampling: simplify CpuCoreSample This patch aims to simplify and strip the baggage from CpuCoreSample - make it a plain function returning a plain dict (of CpuSample namedtuples) - remove getCoreSample helper Change-Id: Ie80905437210286b62fa06189beb16d4db81753f Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 17 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/41251/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 6b13913..65f1a98 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -133,29 +133,26 @@ return CpuSample(user + userNice, userNice, sys, idle) -class CpuCoreSample(object): +_CPU_CORE_STATS_PATTERN = re.compile(r'cpu(\d+)\s+(.*)') + + +def _get_cpu_core_sample(): """ A sample of the CPU consumption of each core The sample is taken at initialization time and can't be updated. """ - CPU_CORE_STATS_PATTERN = re.compile(r'cpu(\d+)\s+(.*)') - def __init__(self): - self.coresSample = {} - with open('/proc/stat') as src: - for line in src: - match = self.CPU_CORE_STATS_PATTERN.match(line) - if match: - user, userNice, sys, idle = \ - map(int, match.group(2).split()[0:4]) - self.coresSample[match.group(1)] = CpuSample( - user, userNice, sys, idle) - - def getCoreSample(self, coreId): - strCoreId = str(coreId) - if strCoreId in self.coresSample: - return self.coresSample[strCoreId] + with open('/proc/stat') as src: + cores_sample = {} + for line in src: + match = _CPU_CORE_STATS_PATTERN.match(line) + if match: + user, userNice, sys, idle = map( + int, match.group(2).split()[0:4]) + cores_sample[match.group(1)] = CpuSample( + user, userNice, sys, idle) + return cores_sample class NumaNodeMemorySample(object): @@ -278,7 +275,7 @@ self.thpState = s[s.index('[') + 1:s.index(']')] except: self.thpState = 'never' - self.cpuCores = CpuCoreSample() + self.cpuCores = _get_cpu_core_sample() self.numaNodeMem = NumaNodeMemorySample() ENGINE_DEFAULT_POLL_INTERVAL = 15 try: @@ -651,8 +648,8 @@ coreStat['nodeIndex'] = int(nodeIndex) hs0, hs1 = self._samples[0], self._samples[-1] interval = hs1.timestamp - hs0.timestamp - sample0 = hs0.cpuCores.getCoreSample(cpuCore) - sample1 = hs1.cpuCores.getCoreSample(cpuCore) + sample0 = hs0.cpuCores.get(cpuCore) + sample1 = hs1.cpuCores.get(cpuCore) jiffies = (sample1.user - sample0.user) % (2 ** 32) coreStat['cpuUser'] = ("%.2f" % (jiffies / interval)) -- To view, visit https://gerrit.ovirt.org/41251 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie80905437210286b62fa06189beb16d4db81753f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 4

Change in vdsm[master]: sampling: make PidCpuSample a function
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: make PidCpuSample a function ...................................................................... sampling: make PidCpuSample a function make the PidCpuSample class a function, which returns a CpuSample namedtuple. The surrounding code doesn't need to change, and the module is now a tiny bit shorter and simpler. Change-Id: Iaffb10fa48ee6876156a27c2ad132298fc9d72ae Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/41250/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index fb99441..6b13913 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -179,16 +179,15 @@ self.nodesMemSample[nodeIndex] = nodeMemSample -class PidCpuSample(object): +def _get_pid_cpu_sample(pid): """ A sample of the CPU consumption of a process. The sample is taken at initialization time and can't be updated. """ - def __init__(self, pid): - with open('/proc/%s/stat' % pid) as stat: - self.user, self.sys = \ - map(int, stat.read().split()[13:15]) + with open('/proc/%s/stat' % pid) as stat: + user, sys = map(int, stat.read().split()[13:15]) + return CpuSample(user, 0, sys, 0) class TimedSample(object): @@ -260,7 +259,7 @@ """ super(HostSample, self).__init__() self.interfaces = _get_interfaces_and_samples() - self.pidcpu = PidCpuSample(pid) + self.pidcpu = _get_pid_cpu_sample(pid) self.totcpu = _get_total_cpu_sample() meminfo = utils.readMemInfo() freeOrCached = (meminfo['MemFree'] + -- To view, visit https://gerrit.ovirt.org/41250 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaffb10fa48ee6876156a27c2ad132298fc9d72ae Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 4

Change in vdsm[master]: sampling: make TotalCpuSample a function
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: make TotalCpuSample a function ...................................................................... sampling: make TotalCpuSample a function make the TotalCpuSample class a function, which returns a CpuSample namedtuple. The surrounding code doesn't need to change, and the module is now a tiny bit shorter and simpler. Change-Id: I27a4248516811bb6e341e438228b828fa661a767 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/41249/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index db10656..fb99441 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -122,17 +122,15 @@ ['user', 'userNice', 'sys', 'idle']) -class TotalCpuSample(object): +def _get_total_cpu_sample(): """ A sample of total CPU consumption. The sample is taken at initialization time and can't be updated. """ - def __init__(self): - with open('/proc/stat') as f: - self.user, userNice, self.sys, self.idle = \ - map(int, f.readline().split()[1:5]) - self.user += userNice + with open('/proc/stat') as f: + user, userNice, sys, idle = map(int, f.readline().split()[1:5]) + return CpuSample(user + userNice, userNice, sys, idle) class CpuCoreSample(object): @@ -263,7 +261,7 @@ super(HostSample, self).__init__() self.interfaces = _get_interfaces_and_samples() self.pidcpu = PidCpuSample(pid) - self.totcpu = TotalCpuSample() + self.totcpu = _get_total_cpu_sample() meminfo = utils.readMemInfo() freeOrCached = (meminfo['MemFree'] + meminfo['Cached'] + meminfo['Buffers']) -- To view, visit https://gerrit.ovirt.org/41249 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27a4248516811bb6e341e438228b828fa661a767 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 4

Change in vdsm[master]: sampling: use CpuSample to store samples
by fromani＠redhat.com 09 Jul '15

09 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: sampling: use CpuSample to store samples ...................................................................... sampling: use CpuSample to store samples To unlock more refactoring and to make code more consistent, introduce CpuSample namedtuple, to have a common consistent container for both PidCpuSample and CoreCpuSample. Change-Id: Ide56027ed979751c80c4733aa2ca5e3b0795f2dd Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/sampling.py 1 file changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/41248/1 diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 79f6af5..db10656 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -118,6 +118,10 @@ if getattr(self, attr) != getattr(other, attr)) +CpuSample = namedtuple('CpuSample', + ['user', 'userNice', 'sys', 'idle']) + + class TotalCpuSample(object): """ A sample of total CPU consumption. @@ -145,14 +149,10 @@ for line in src: match = self.CPU_CORE_STATS_PATTERN.match(line) if match: - coreSample = {} user, userNice, sys, idle = \ map(int, match.group(2).split()[0:4]) - coreSample['user'] = user - coreSample['userNice'] = userNice - coreSample['sys'] = sys - coreSample['idle'] = idle - self.coresSample[match.group(1)] = coreSample + self.coresSample[match.group(1)] = CpuSample( + user, userNice, sys, idle) def getCoreSample(self, coreId): strCoreId = str(coreId) @@ -654,14 +654,15 @@ coreStat['nodeIndex'] = int(nodeIndex) hs0, hs1 = self._samples[0], self._samples[-1] interval = hs1.timestamp - hs0.timestamp - jiffies = (hs1.cpuCores.getCoreSample(cpuCore)['user'] - - hs0.cpuCores.getCoreSample(cpuCore)['user']) % \ - (2 ** 32) + sample0 = hs0.cpuCores.getCoreSample(cpuCore) + sample1 = hs1.cpuCores.getCoreSample(cpuCore) + + jiffies = (sample1.user - sample0.user) % (2 ** 32) coreStat['cpuUser'] = ("%.2f" % (jiffies / interval)) - jiffies = (hs1.cpuCores.getCoreSample(cpuCore)['sys'] - - hs0.cpuCores.getCoreSample(cpuCore)['sys']) % \ - (2 ** 32) + + jiffies = (sample1.sys - sample0.sys) % (2 ** 32) coreStat['cpuSys'] = ("%.2f" % (jiffies / interval)) + coreStat['cpuIdle'] = ("%.2f" % max(0.0, 100.0 - float(coreStat['cpuUser']) - -- To view, visit https://gerrit.ovirt.org/41248 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide56027ed979751c80c4733aa2ca5e3b0795f2dd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

2 4

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: events: extract function to make event info
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: events: extract function to make event info ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43268 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If60e8422d06fb1ff45a846858856ad68d52fd6ce Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on RTC update
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on RTC update ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: add minimal running stats to status
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: add minimal running stats to status ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 09 Jul '15

09 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: lib: migration: add response.is_failure helper
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: lib: migration: add response.is_failure helper ...................................................................... lib: migration: add response.is_failure helper Add little helper to make the code more explicit and self-documenting. Change-Id: I6ccefec4f1bebcb2ca64f0bc9f6b9e9954dbf04c Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/response.py M vdsm/virt/migration.py 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/42795/1 diff --git a/lib/vdsm/response.py b/lib/vdsm/response.py index 758fde8..eea62ef 100644 --- a/lib/vdsm/response.py +++ b/lib/vdsm/response.py @@ -40,3 +40,7 @@ "message": message or status["message"] } } + + +def is_failure(res): + return res["status"]["code"] != doneCode["code"] diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index a51d977..99af017 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -197,7 +197,7 @@ self._vm.lastStatus = vmstatus.MIGRATION_SOURCE def _recover(self, message): - if not self._last_status['status']['code']: + if not response.is_failure(self._last_status): self._last_status = response.error('migrateErr') self.log.error(message) if not self.hibernating: @@ -325,7 +325,7 @@ self.log.info('Creation of destination VM took: %d seconds', destCreationTime) - if result['status']['code']: + if response.is_failure(result): self._last_status = result raise RuntimeError('migration destination error: ' + result['status']['message']) -- To view, visit https://gerrit.ovirt.org/42795 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ccefec4f1bebcb2ca64f0bc9f6b9e9954dbf04c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 27

Change in vdsm[master]: vm: simplify Vm._getVmStatus method
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: simplify Vm._getVmStatus method ...................................................................... vm: simplify Vm._getVmStatus method Vm._getVmStatus returns a dict with just one key/value pair, being the computed vm status (unsurprisingly). This was done without a good reason, just to make the caller look uniform. But more and more we need just the status value, so the temporary dictionary is wasteful and redundant. So, this patch simplifies the code to return indeed just the value. Change-Id: I3f02efa1001aff5fbf01d127b333250500de9d54 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/43267/2 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 826e4e9..4dd8153 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -379,7 +379,7 @@ self._lastStatus = value def send_status_event(self): - vm_status = self._getVmStatus()['status'] + vm_status = self._getVmStatus() stats = {} with self._eventLock: if vm_status != self._evaluatedStatus: @@ -1327,7 +1327,7 @@ else: stats.update(self._getConfigVmStats()) stats.update(self._getRunningVmStats()) - stats.update(self._getVmStatus()) + stats['status'] = self._getVmStatus() stats.update(self._getGuestStats()) return stats @@ -1474,16 +1474,16 @@ vmstatus.MIGRATION_SOURCE, vmstatus.MIGRATION_DESTINATION, vmstatus.PAUSED) if self.lastStatus in statuses: - return {'status': self.lastStatus} + return self.lastStatus elif self.isMigrating(): if self._migrationSourceThread.hibernating: - return {'status': vmstatus.SAVING_STATE} + return vmstatus.SAVING_STATE else: - return {'status': vmstatus.MIGRATION_SOURCE} + return vmstatus.MIGRATION_SOURCE elif self.lastStatus == vmstatus.UP: - return {'status': _getVmStatusFromGuest()} + return _getVmStatusFromGuest() else: - return {'status': self.lastStatus} + return self.lastStatus def _getGraphicsStats(self): def getInfo(dev): -- To view, visit https://gerrit.ovirt.org/43267 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f02efa1001aff5fbf01d127b333250500de9d54 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

5 9

Change in vdsm[master]: StorageDomainManifest: move logBlkSize
by alitke＠redhat.com 08 Jul '15

08 Jul '15

Adam Litke has uploaded a new change for review. Change subject: StorageDomainManifest: move logBlkSize ...................................................................... StorageDomainManifest: move logBlkSize logBlkSize is also needed by the VolumeMetadata newVolumeLease function. Move it into the manifest class which is safe for VolumeMetadata to instantiate. Change-Id: I1b9b20e9c8c20fa5c151f7c86337bc54ab526e11 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockSD.py M vdsm/storage/sd.py 2 files changed, 23 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/41996/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 7ccb7e5..c67822f 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -404,6 +404,17 @@ metadata = selectMetadata(sdUUID) sd.StorageDomainManifest.__init__(self, sdUUID, domaindir, metadata) + try: + self.logBlkSize = self.getMetaParam(DMDK_LOGBLKSIZE) + self.phyBlkSize = self.getMetaParam(DMDK_PHYBLKSIZE) + except KeyError: + # 512 by Saggi "Trust me (Smoch Alai (sic))" + # *blkSize keys may be missing from metadata only for domains that + # existed before the introduction of the keys. + # Such domains supported only 512 sizes + self.logBlkSize = 512 + self.phyBlkSize = 512 + def getVSize(self, imgUUUID, volUUID): """ Return the block volume size in bytes. """ try: @@ -433,17 +444,6 @@ lvm.activateLVs(self.sdUUID, SPECIAL_LVS) self.metavol = lvm.lvPath(self.sdUUID, sd.METADATA) - try: - self.logBlkSize = self.getMetaParam(DMDK_LOGBLKSIZE) - self.phyBlkSize = self.getMetaParam(DMDK_PHYBLKSIZE) - except KeyError: - # 512 by Saggi "Trust me (Smoch Alai (sic))" - # *blkSize keys may be missing from metadata only for domains that - # existed before the introduction of the keys. - # Such domains supported only 512 sizes - self.logBlkSize = 512 - self.phyBlkSize = 512 - # Check that all devices in the VG have the same logical and physical # block sizes. lvm.checkVGBlockSizes(sdUUID, (self.logBlkSize, self.phyBlkSize)) @@ -455,6 +455,14 @@ self._registerResourceNamespaces() self._lastUncachedSelftest = 0 + @property + def logBlkSize(self): + return self.manifest.logBlkSize + + @property + def phyBlkSize(self): + return self.manifest.phyBlkSize + def _registerResourceNamespaces(self): """ Register resources namespaces and create diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index fd4cecf..da454ef 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -307,6 +307,9 @@ def getLeasesFilePath(self): return os.path.join(self.getMDPath(), LEASES) + def getMetaParam(self, key): + return self._metadata[key] + class StorageDomain(object): log = logging.getLogger("Storage.StorageDomain") @@ -782,7 +785,7 @@ self._metadata.invalidate() def getMetaParam(self, key): - return self._metadata[key] + return self.manifest.getMetaParam(key) def getStorageType(self): return self.getMetaParam(DMDK_TYPE) -- To view, visit https://gerrit.ovirt.org/41996 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b9b20e9c8c20fa5c151f7c86337bc54ab526e11 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

5 28

Change in vdsm[master]: StorageDomainManifest: move getLeasesFilePath
by alitke＠redhat.com 08 Jul '15

08 Jul '15

Adam Litke has uploaded a new change for review. Change subject: StorageDomainManifest: move getLeasesFilePath ...................................................................... StorageDomainManifest: move getLeasesFilePath getLeasesFilePath is needed by VolumeMetadata to implement the newVolumeLease function on block storage. Move it into the Manifest class which can be safely instantiated. Change-Id: I2bb49591357e0ae77268789da78e8504864a8057 Signed-off-by: Adam Litke <alitke(a)redhat.com> --- M vdsm/storage/blockSD.py M vdsm/storage/sd.py 2 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/41995/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 362ee28..7ccb7e5 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -419,6 +419,10 @@ return int(size) + def getLeasesFilePath(self): + lvm.activateLVs(self.sdUUID, [sd.LEASES]) + return lvm.lvPath(self.sdUUID, sd.LEASES) + class BlockStorageDomain(sd.StorageDomain): ManifestClass = BlockStorageDomainManifest @@ -817,10 +821,6 @@ def getIdsFilePath(self): lvm.activateLVs(self.sdUUID, [sd.IDS]) return lvm.lvPath(self.sdUUID, sd.IDS) - - def getLeasesFilePath(self): - lvm.activateLVs(self.sdUUID, [sd.LEASES]) - return lvm.lvPath(self.sdUUID, sd.LEASES) def getLeasesFileSize(self): lv = lvm.getLV(self.sdUUID, sd.LEASES) diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index ab86987..fd4cecf 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -299,6 +299,14 @@ self.domaindir = domaindir self._metadata = metadata + def getMDPath(self): + if self.domaindir: + return os.path.join(self.domaindir, DOMAIN_META_DATA) + return None + + def getLeasesFilePath(self): + return os.path.join(self.getMDPath(), LEASES) + class StorageDomain(object): log = logging.getLogger("Storage.StorageDomain") @@ -459,9 +467,7 @@ preallocate, diskType, volUUID, desc, srcImgUUID, srcVolUUID) def getMDPath(self): - if self.domaindir: - return os.path.join(self.domaindir, DOMAIN_META_DATA) - return None + return self.manifest.getMDPath() def initSPMlease(self): """ @@ -497,7 +503,7 @@ return os.path.join(self.getMDPath(), IDS) def getLeasesFilePath(self): - return os.path.join(self.getMDPath(), LEASES) + return self.manifest.getLeasesFilePath() def getReservedId(self): return self._clusterLock.getReservedId() -- To view, visit https://gerrit.ovirt.org/41995 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bb49591357e0ae77268789da78e8504864a8057 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <alitke(a)redhat.com>

5 32

Change in vdsm[master]: Revert "hba: Run fc-scan in supervdsm"
by Nir Soffer 08 Jul '15

08 Jul '15

Nir Soffer has uploaded a new change for review. Change subject: Revert "hba: Run fc-scan in supervdsm" ...................................................................... Revert "hba: Run fc-scan in supervdsm" In commit 0636b8607b (Revert "supervdsm: Add zombiereaper to supervdsm") We removed zombiereaper from supervdsm, but hba._scan(), called from supervdsm was depending on zombiereaper reaping stuck fc-scan processes. This cause stuck fc-scan Python processes to run as zombie for the whole lifetime of the supervdsm processs. This revert back to running fc-scan using sudo from vdsm. We can reintrocude the reverted patch when we have a working zombiereaper in supervdsm. This reverts commit 5a6ae1a266e6808861a10933d7cacb81838050f1. Change-Id: Ica493bd2e269ae3fcee2e2ec91df5aa5e323a23f Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/hba.py M vdsm/sudoers.vdsm.in M vdsm/supervdsmServer 3 files changed, 7 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/37261/1 diff --git a/vdsm/storage/hba.py b/vdsm/storage/hba.py index efd0273..0d4e688 100644 --- a/vdsm/storage/hba.py +++ b/vdsm/storage/hba.py @@ -31,7 +31,6 @@ from vdsm.infra import zombiereaper import misc -import supervdsm log = logging.getLogger("Storage.HBA") @@ -44,41 +43,27 @@ NODE_NAME = "node_name" -class Error(Exception): - """ hba operation failed """ - - @misc.samplingmethod def rescan(): """ Rescan HBAs discovering new devices. """ - log.debug("Starting scan") - try: - supervdsm.getProxy().hbaRescan() - except Error as e: - log.error("Scan failed: %s", e) - else: - log.debug("Scan finished") - - -def _rescan(): - """ - Called from supervdsm to perform rescan as root. - """ timeout = config.getint('irs', 'scsi_rescan_maximal_timeout') - proc = utils.execCmd([constants.EXT_FC_SCAN], sync=False, + log.debug("Starting scan") + proc = utils.execCmd([constants.EXT_FC_SCAN], sync=False, sudo=True, execCmdLogger=log) try: proc.wait(timeout) finally: if proc.returncode is None: + log.warning("Timeout scanning") zombiereaper.autoReapPID(proc.pid) - raise Error("Timeout scanning (pid=%s)" % proc.pid) elif proc.returncode != 0: stderr = proc.stderr.read(512) - raise Error("Scan failed: %r" % stderr) + log.error("Scan failed: %r", stderr) + else: + log.debug("Scan finished") def getiSCSIInitiators(): diff --git a/vdsm/sudoers.vdsm.in b/vdsm/sudoers.vdsm.in index da88ff2..0572866 100644 --- a/vdsm/sudoers.vdsm.in +++ b/vdsm/sudoers.vdsm.in @@ -15,6 +15,7 @@ @BINDIR@/vdsm-tool service-restart multipathd, \ @BINDIR@/vdsm-tool service-reload multipathd, \ @ISCSIADM_PATH@ *, \ + @LIBEXECDIR@/fc-scan, \ @LVM_PATH@, \ @CAT_PATH@ /sys/block/*/device/../../*, \ @CAT_PATH@ /sys/devices/platform/host*, \ diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 7a984e4..1c10c81 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -65,7 +65,6 @@ from storage.iscsi import getDevIscsiInfo as _getdeviSCSIinfo from storage.iscsi import readSessionInfo as _readSessionInfo from supervdsm import _SuperVdsmManager -from storage import hba from storage.fileUtils import chown, resolveGid, resolveUid from storage.fileUtils import validateAccess as _validateAccess from vdsm.constants import METADATA_GROUP, EXT_CHOWN, EXT_UDEVADM, \ @@ -347,10 +346,6 @@ @logDecorator def fuser(self, *args, **kwargs): return fuser.fuser(*args, **kwargs) - - @logDecorator - def hbaRescan(self): - return hba._rescan() @logDecorator def set_rp_filter_loose(self, dev): -- To view, visit http://gerrit.ovirt.org/37261 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica493bd2e269ae3fcee2e2ec91df5aa5e323a23f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 15

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 08 Jul '15

08 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 5: This version makes creating the return value little nicer. -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: logging: introduce the Virt logger
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: virt: logging: introduce the Virt logger ...................................................................... virt: logging: introduce the Virt logger Add the 'Virt' top level logger, to make it easier to separate the logging messages. Change-Id: I5ea35e484148613d5714f6dd9703fbe27446524f Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/logger.conf.in M vdsm/virt/periodic.py M vdsm/virt/sampling.py M vdsm/virt/vm.py M vdsm/virt/vmtune.py 5 files changed, 13 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/42687/1 diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index 013045a..dcecc24 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -1,5 +1,5 @@ [loggers] -keys=root,vds,Storage,ovirt_hosted_engine_ha,IOProcess,connectivity +keys=root,vds,Storage,Virt,ovirt_hosted_engine_ha,IOProcess,connectivity [handlers] keys=console,syslog,logfile,connlogfile @@ -42,6 +42,12 @@ qualname=connectivity propagate=0 +[logger_Virt] +level=DEBUG +handlers=logfile +qualname=Virt +propagate=0 + [handler_syslog] level=WARNING class=handlers.SysLogHandler diff --git a/vdsm/virt/periodic.py b/vdsm/virt/periodic.py index 3f901e3..76df45e 100644 --- a/vdsm/virt/periodic.py +++ b/vdsm/virt/periodic.py @@ -126,7 +126,7 @@ It would be called again even if a former call is blocked. """ - _log = logging.getLogger("periodic.Operation") + _log = logging.getLogger("Virt.periodic.Operation") def __init__(self, func, period, timeout=0, scheduler=None, executor=None): @@ -205,7 +205,7 @@ isolation among them. """ - _log = logging.getLogger("periodic.VmDispatcher") + _log = logging.getLogger("Virt.periodic.VmDispatcher") def __init__(self, get_vms, executor, create, timeout): """ diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index a5b69f0..fded994 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -405,7 +405,7 @@ between a well behaving call and an unblocked stuck call. """ - _log = logging.getLogger("sampling.StatsCache") + _log = logging.getLogger("Virt.sampling.StatsCache") def __init__(self, clock=utils.monotonic_time): self._clock = clock @@ -506,7 +506,7 @@ self._stats_flags = stats_flags self._skip_doms = ExpiringCache(timeout) self._sampling = threading.Semaphore() # used as glorified counter - self._log = logging.getLogger("sampling.VMBulkSampler") + self._log = logging.getLogger("Virt.sampling.VMBulkSampler") def __call__(self): timestamp = self._stats_cache.clock() diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index eabec1d..dbfea94 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -240,7 +240,7 @@ its behaviour. """ - log = logging.getLogger("vm.Vm") + log = logging.getLogger("Virt.vm.Vm") # limit threads number until the libvirt lock will be fixed _ongoingCreations = threading.BoundedSemaphore(4) DeviceMapping = ((hwclass.DISK, vmdevices.storage.Drive), diff --git a/vdsm/virt/vmtune.py b/vdsm/virt/vmtune.py index 23ebe61..da86e92 100644 --- a/vdsm/virt/vmtune.py +++ b/vdsm/virt/vmtune.py @@ -25,7 +25,7 @@ from . import vmxml -log = logging.getLogger(__name__) +log = logging.getLogger('Virt.vmtune') def io_tune_values_to_dom(values, dom): -- To view, visit https://gerrit.ovirt.org/42687 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ea35e484148613d5714f6dd9703fbe27446524f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 12

Change in vdsm[master]: vm: event: introduce _send_event helper
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on setDownStatus
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on setDownStatus ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43270 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9a99d074461bcc2b61d15dd46f7d020abbe48afe Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on domDependentInit
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on domDependentInit ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43269 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie379911a374a9ba3e82658592c295f7a9a0ac8a0 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on reboot
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on reboot ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I748b187228a39e55982c1b7d05ab47681481801c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on RTC update
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on RTC update ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43310 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e17262812547ea64365aa4fe77b64d27d579de5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: add minimal running stats to status
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: add minimal running stats to status ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43290 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I894a1b10d3cc3dd33664ea9f0842cbc7f1eb07b3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: emit event on guest status change
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: emit event on guest status change ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43289 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib98d64a250a6d2de70f7fe5206e5a0ad648c151d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: do not send status event on startup
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: vm: event: do not send status event on startup ...................................................................... vm: event: do not send status event on startup We send an explicit event, so no need to send implicitely when we receive something from the libvirt event loop. Change-Id: I2d2c1b1d1132e1d3792b1a8c8f9241b6e6eb3164 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/43288/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 6f9a2d7..d453ff9 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -799,7 +799,6 @@ else: self.log.exception("The vm start process failed") self.setDownStatus(ERROR, vmexitreason.GENERIC_ERROR, str(e)) - self.send_status_event() def _incomingMigrationPending(self): return 'migrationDest' in self.conf or 'restoreState' in self.conf -- To view, visit https://gerrit.ovirt.org/43288 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d2c1b1d1132e1d3792b1a8c8f9241b6e6eb3164 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

2 3

Change in vdsm[master]: WIP client: allow tuning of more SLA params
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: WIP client: allow tuning of more SLA params ...................................................................... WIP client: allow tuning of more SLA params still WIP, we probably don't want this. Change-Id: I03e0900b829d49a63bef89e260ad2dc0be7e0a79 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M client/vdsClient.py M vdsm/API.py 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/38938/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 546deab..7ed4c89 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -272,8 +272,11 @@ return self.ExecAndExit(self.s.setNumberOfCpus(args[0], args[1])) def updateVmPolicy(self, args): - params = {'vmId': args[0], 'vcpuLimit': args[1]} - return self.ExecAndExit(self.s.updateVmPolicy(params)) + if args[1] in ('vcpuLimit', 'vcpuQuota', 'vcpuPeriod'): + params = {'vmId': args[0], args[1]: args[2]} + return self.ExecAndExit(self.s.updateVmPolicy(params)) + else: + raise ValueError('Invalid argument "%s".' % args[1]) def do_changeCD(self, args): vmId = args[0] @@ -2807,7 +2810,7 @@ )), 'updateVmPolicy': ( serv.updateVmPolicy, ( - '<vmId> <vcpuLimit>', + '<vmId> [vcpuLimit|vcpuQuota|vcpuPeriod] value', 'set SLA parameter for a VM' )), 'externalVMList': ( diff --git a/vdsm/API.py b/vdsm/API.py index 8151ff4..8d6f0a7 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -496,6 +496,14 @@ # Remove the vmId parameter from params we do not need it anymore del params["vmId"] + vcpuQuota = params.pop('vcpuQuota', None) + if vcpuQuota: + return curVm.setCpuTuneQuota(vcpuQuota) + + vcpuPeriod = params.pop('vcpuPeriod', None) + if vcpuPeriod: + return curVm.setCpuTunePeriod(vcpuPeriod) + return curVm.updateVmPolicy(params) def migrate(self, params): -- To view, visit https://gerrit.ovirt.org/38938 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03e0900b829d49a63bef89e260ad2dc0be7e0a79 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 5

Change in vdsm[master]: client: add terse list output
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: client: add terse list output ...................................................................... client: add terse list output Mostly a debug aid to make sure to exercise the short output of getVMList API (getVMList(fullStatus=False, ...) Change-Id: I6cb93285dca4d52a07147eba394c7070545c54db Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M client/vdsClient.py 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/38823/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 1fdf432..546deab 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -287,7 +287,7 @@ def do_list(self, args): """ - Usage: vdsClient 0 list [table/long/ids] [vms:vmId1,vmId2] + Usage: vdsClient 0 list [table/long/sort/ids] [vms:vmId1,vmId2] """ def _vmsParser(vmsParam): vmsList = vmsParam.split(':')[1].strip() @@ -297,7 +297,7 @@ raise ValueError('Empty VMs list.') return vmsList - vmListViews = ('table', 'long', 'ids') + vmListViews = ('table', 'long', 'terse', 'ids') view = 'long' # Default view vms = [] @@ -323,7 +323,8 @@ if not vms or res['vmId'] in vms: allStats[res['vmId']] = res - response = self.s.list(True, vms) + fullStatus = True if view == 'long' else False + response = self.s.list(fullStatus, vms) if response['status']['code']: return response['status']['code'], response['status']['message'] @@ -333,6 +334,12 @@ conf['sysprepInf'] = '<<exists>>' if not self.quiet: printConf(conf) + + elif view == 'terse': + vmId = conf.pop('vmId') + status = conf.pop('status') + extra = " extra=%s" % str(conf) if conf else "" + print("%-36s %-20s%s" % (vmId, status, extra)) elif view == 'table': vmId = conf['vmId'] @@ -2144,6 +2151,7 @@ " 'vmId1,vmId2,...'", 'Optional views:', ' "long" all available configuration info (Default).', + ' "terse" terse output with vmId, Status.', ' "table" table output with the fields: vmId, vmName, ' 'Status and IP.', ' "ids" all vmIds.' -- To view, visit https://gerrit.ovirt.org/38823 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cb93285dca4d52a07147eba394c7070545c54db Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 8

Change in vdsm[master]: client: add option to make quiet
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: client: add option to make quiet ...................................................................... client: add option to make quiet When used for (quite brutal) benchmarking, the output from vdsClient can add noise and can cause a (little) slowdown. Add an option to make it quiet. Change-Id: Icbb9654b47fd993aee34b2292a1d94d1e4019b6a Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M client/vdsClient.py 1 file changed, 25 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/35340/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index 583a0a2..d675228 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -183,11 +183,12 @@ self.useSSL = False self.truststore = None self.pretty = True + self.quiet = False def do_connect(self, hostPort): self.s = vdscli.connect(hostPort, self.useSSL, self.truststore) - def ExecAndExit(self, response, parameterName='none'): + def printResponse(self, response, parameterName='none'): if response['status']['code'] != 0: print response['status']['message'] else: @@ -202,6 +203,10 @@ printDict(response['info'], self.pretty) else: printDict(response['status'], self.pretty) + + def ExecAndExit(self, response, parameterName='none'): + if not self.quiet: + self.printResponse(response, parameterName) sys.exit(response['status']['code']) def do_create(self, args): @@ -309,7 +314,8 @@ if view == 'long': if 'sysprepInf' in conf: conf['sysprepInf'] = '<<exists>>' - printConf(conf) + if not self.quiet: + printConf(conf) elif view == 'table': vmId = conf['vmId'] @@ -318,20 +324,23 @@ status = conf['status'] if allStats[vmId].get('monitorResponse') == '-1': status += '*' - print("%-36s %6s %-20s %-20s %-20s" % - (vmId, conf.get('pid', 'none'), - conf.get('vmName', '<< NO NAME >>'), - status, allStats[vmId].get('guestIPs', ''))) + if not self.quiet: + print("%-36s %6s %-20s %-20s %-20s" % + (vmId, conf.get('pid', 'none'), + conf.get('vmName', '<< NO NAME >>'), + status, allStats[vmId].get('guestIPs', ''))) elif view == 'ids': - print conf['vmId'] + if not self.quiet: + print conf['vmId'] sys.exit(response['status']['code']) def do_destroy(self, args): vmId = args[0] response = self.s.destroy(vmId) - print response['status']['message'] + if not self.quiet: + print response['status']['message'] sys.exit(response['status']['code']) def do_pause(self, args): @@ -356,7 +365,8 @@ response = self.s.shutdown(vmId, delay, message, reboot) else: response = self.s.shutdown(vmId, delay, message) - print response['status']['message'] + if not self.quiet: + print response['status']['message'] sys.exit(response['status']['code']) def do_setVmTicket(self, args): @@ -2765,9 +2775,10 @@ commands.update(ge.getGlusterCmdDict(serv)) try: - opts, args = getopt.getopt(sys.argv[1:], "hmso", ["help", "methods", - "SSL", "truststore=", - "oneliner"]) + opts, args = getopt.getopt(sys.argv[1:], + "hmsoq", + ["help", "methods", "SSL", "truststore=", + "oneliner", "quiet"]) for o, v in opts: if o == "-h" or o == "--help": @@ -2782,6 +2793,8 @@ serv.truststore = v if o == '-o' or o == '--oneliner': serv.pretty = False + if o == '-q' or o == '--quiet': + serv.quiet = True if len(args) < 2: raise Exception("Need at least two arguments") server, command = args[0:2] -- To view, visit http://gerrit.ovirt.org/35340 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbb9654b47fd993aee34b2292a1d94d1e4019b6a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 7

Change in vdsm[master]: client: vm params from JSON
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has uploaded a new change for review. Change subject: client: vm params from JSON ...................................................................... client: vm params from JSON the 'create' parameter accepts a configuration file as source to define the parameters of the VM being created. This patch add support to 1. use JSON for this configuration file, so there is little to no need to reformat data from Engine, for example took from VDSM logs 2. use stdin as input, avoiding the need to write (temporary) files. Change-Id: Ic6a73bc0e5fe87eb1a48c708e7ea316c6d9df7e5 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M client/vdsClient.py 1 file changed, 95 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/35292/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index aabf7a1..583a0a2 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -19,6 +19,7 @@ import sys import ast +import json import getopt import traceback import xmlrpclib @@ -204,74 +205,13 @@ sys.exit(response['status']['code']) def do_create(self, args): - params = {} - drives = [] - devices = [] - cpuPinning = {} - numaTune = {} - guestNumaNodes = [] - confLines = [] - confFile = open(args[0]) - for line in confFile.readlines(): - line = re.sub("\s+", '', line) - line = re.sub("\#.*", '', line) - if line: - confLines.append(line) - if len(args) > 1: - confLines.extend(args[1:]) - for line in confLines: - if '=' in line: - param, value = line.split("=", 1) - if param == 'devices': - devices.append(self._parseDriveSpec(value)) - elif param == 'drive': - drives.append(self._parseDriveSpec(value)) - elif param == 'cpuPinning': - cpuPinning, rStr = self._parseNestedSpec(value) - elif param == 'numaTune': - numaTune, rStr = self._parseNestedSpec(value) - elif param == 'guestNumaNodes': - guestNumaNodes.append(self._parseDriveSpec(value)) - elif param.startswith('custom_'): - if 'custom' not in params: - params['custom'] = {} - params['custom'][param[7:]] = value - else: - if param in ('cdrom', 'floppy'): - value = self._parseDriveSpec(value) - params[param] = value - else: - params[line.strip()] = '' - if cpuPinning: - params['cpuPinning'] = cpuPinning - if numaTune: - params['numaTune'] = numaTune - if guestNumaNodes: - params['guestNumaNodes'] = guestNumaNodes - if drives: - params['drives'] = drives - if devices: - params['devices'] = devices - # Backward compatibility for vdsClient users - if 'vt' in params: - params['kvmEnable'] = params['vt'] - - if 'imageFile' in params: - params['hda'] = params['imageFile'] - - drives = ['hdd', 'hdc', 'hdb'] - if 'moreImages' in params: - for image in params['moreImages'].split(','): - params[drives.pop()] = image - - if 'sysprepInf' in params: - infFile = open(params['sysprepInf'], 'rb') - try: - params['sysprepInf'] = xmlrpclib.Binary(infFile.read()) - finally: - infFile.close() - - return self.ExecAndExit(self.s.create(params)) + if args[0] == '-' or args[0].endswith('.json'): + params = self._readVmParamsFromJson(args) + else: + params = self._readVmParamsFromConf(args) + if params is not None: + return self.ExecAndExit(self.s.create(params)) + return sys.exit(1) def vmUpdateDevice(self, args): params = self._eqSplit(args[1:]) @@ -1884,6 +1824,93 @@ return status['status']['code'], status['status']['message'] + def _readVmParamsFromJson(self, args): + if args[0] == "-": + data = sys.stdin.read() + else: + try: + with open(args[0]) as f: + data = f.read() + except IOError as e: + print "failed to read VM config: %s" % str(e) + return None + try: + return json.loads(data) + except ValueError as e: + print "failed to decode VM config: %s" % str(e) + return None + + def _readVmParamsFromConf(self, args): + params = {} + drives = [] + devices = [] + cpuPinning = {} + numaTune = {} + guestNumaNodes = [] + confLines = [] + confFile = open(args[0]) + for line in confFile.readlines(): + line = re.sub("\s+", '', line) + line = re.sub("\#.*", '', line) + if line: + confLines.append(line) + if len(args) > 1: + confLines.extend(args[1:]) + for line in confLines: + if '=' in line: + param, value = line.split("=", 1) + if param == 'devices': + devices.append(self._parseDriveSpec(value)) + elif param == 'drive': + drives.append(self._parseDriveSpec(value)) + elif param == 'cpuPinning': + cpuPinning, rStr = self._parseNestedSpec(value) + elif param == 'numaTune': + numaTune, rStr = self._parseNestedSpec(value) + elif param == 'guestNumaNodes': + guestNumaNodes.append(self._parseDriveSpec(value)) + elif param.startswith('custom_'): + if 'custom' not in params: + params['custom'] = {} + params['custom'][param[7:]] = value + else: + if param in ('cdrom', 'floppy'): + value = self._parseDriveSpec(value) + params[param] = value + else: + params[line.strip()] = '' + if cpuPinning: + params['cpuPinning'] = cpuPinning + if numaTune: + params['numaTune'] = numaTune + if guestNumaNodes: + params['guestNumaNodes'] = guestNumaNodes + if drives: + params['drives'] = drives + if devices: + params['devices'] = devices + # Backward compatibility for vdsClient users + if 'vt' in params: + params['kvmEnable'] = params['vt'] + + if 'imageFile' in params: + params['hda'] = params['imageFile'] + + drives = ['hdd', 'hdc', 'hdb'] + if 'moreImages' in params: + for image in params['moreImages'].split(','): + params[drives.pop()] = image + + if 'sysprepInf' in params: + infFile = open(params['sysprepInf'], 'rb') + try: + params['sysprepInf'] = xmlrpclib.Binary(infFile.read()) + finally: + infFile.close() + + return params + + if __name__ == '__main__': if _glusterEnabled: serv = ge.GlusterService() -- To view, visit http://gerrit.ovirt.org/35292 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6a73bc0e5fe87eb1a48c708e7ea316c6d9df7e5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 9

Change in vdsm[master]: vm: event: introduce _send_event helper
by fromani＠redhat.com 08 Jul '15

08 Jul '15

Francesco Romani has posted comments on this change. Change subject: vm: event: introduce _send_event helper ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/43287/2/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 382: self._send_event( Line 383: self._getVmStatus() Line 384: ) Line 385: Line 386: def _send_event(self, vm_status, **kwargs); typo! Line 387: event_data = {} Line 388: with self._eventLock: Line 389: if vm_status != self._evaluatedStatus: Line 390: self._evaluatedStatus = vm_status -- To view, visit https://gerrit.ovirt.org/43287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4c25ba9f520e6409cc06e99a2450d2c0d98c26fb Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: virt: fix VM creation logic condition
by Martin Polednik 08 Jul '15

08 Jul '15

Martin Polednik has uploaded a new change for review. Change subject: virt: fix VM creation logic condition ...................................................................... virt: fix VM creation logic condition We want to look up the CPU in tuple of CPUs, but we currently supply string instead of tuple. Change-Id: Ie1eb15f9865dadab791be97b7d009d5bae025265 Signed-off-by: Martin Polednik <mpolednik(a)redhat.com> --- M vdsm/virt/vmxml.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/43170/1 diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py index 7b9ab9c..b9ff3be 100644 --- a/vdsm/virt/vmxml.py +++ b/vdsm/virt/vmxml.py @@ -337,7 +337,7 @@ cpu = Element('cpu') - if self.arch in (caps.Architecture.X86_64): + if self.arch in (caps.Architecture.X86_64,): cpu.setAttrs(match='exact') features = self.conf.get('cpuType', 'qemu64').split(',') -- To view, visit https://gerrit.ovirt.org/43170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1eb15f9865dadab791be97b7d009d5bae025265 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com>

4 8

Change in vdsm[master]: ceph: Support OVF_STORE upload for ceph.
by Nir Soffer 08 Jul '15

08 Jul '15

Nir Soffer has posted comments on this change. Change subject: ceph: Support OVF_STORE upload for ceph. ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/43296/2/vdsm/rpc/bindingxmlrpc.py File vdsm/rpc/bindingxmlrpc.py: Line 189: self.HEADER_RBD_IMAGE) Line 190: methodArgs['rbdHosts'] = self.headers.getheader( Line 191: self.HEADER_RBD_HOSTS) Line 192: methodArgs['rbdKey'] = self.headers.getheader( Line 193: self.HEADER_RBD_KEY) We need same code for do_GET, lets extract it to _get_rbd_headers(). Line 194: Line 195: uploadFinishedEvent, operationEndCallback = \ Line 196: self._createEventWithCallback() Line 197: -- To view, visit https://gerrit.ovirt.org/43296 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iffcc1af9861a5580786340c2e5a325d1663b3a5e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: freeze: Avoid unneeded freeze during snapshot
by Nir Soffer 08 Jul '15

08 Jul '15

Nir Soffer has posted comments on this change. Change subject: freeze: Avoid unneeded freeze during snapshot ...................................................................... Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/43293/4/vdsm/rpc/vdsmapi-schema.json File vdsm/rpc/vdsmapi-schema.json: Line 7881: # @snapMemory: #optional str representation of the volumes in which Line 7882: # the memory dump and vm configuration should be saved Line 7883: # Line 7884: # @frozen: #optional Boolean value set to true if the vm is frozen Line 7885: # and does not need to be freezed during the snapshot. > please add Sure, good catch. Line 7886: # Line 7887: # Since: 4.10.0 Line 7888: ## Line 7889: {'command': {'class': 'VM', 'name': 'snapshot'}, -- To view, visit https://gerrit.ovirt.org/43293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I328470f700ab74daeed5375c0ade83628d16c387 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <mskrivan(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: virt: clientif: remove generic vm status event
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: virt: clientif: remove generic vm status event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I392857f2e4f02c14f88aca85af17861e84b2f6fa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on lifecycle event
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on lifecycle event ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43313 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46c3ca382a1055ba45618ed9e3d364d971add145 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on IO Error
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on IO Error ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43312 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4be90f1267e82b8af2abb36c06cfd9a70fb558 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

Change in vdsm[master]: vm: event: send status event on watchdog trigger
by automation＠ovirt.org 08 Jul '15

08 Jul '15

automation(a)ovirt.org has posted comments on this change. Change subject: vm: event: send status event on watchdog trigger ...................................................................... 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.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/43311 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I390664a5295a51d475902b2ddeaba77d65ad718d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-HasComments: No

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches July 2015