vdsm-patches December 2014

vdsm-patches@lists.fedorahosted.org

42 participants
734 discussions

Change in vdsm[master]: Add the missing --enable-rhev definition to configure.ac
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has uploaded a new change for review. Change subject: Add the missing --enable-rhev definition to configure.ac ...................................................................... Add the missing --enable-rhev definition to configure.ac Change-Id: I3b253be2710bc979e3e14f1525f0157a0e65440f Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- M configure.ac 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/35796/1 diff --git a/configure.ac b/configure.ac index 32c2d90..71901ac 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,16 @@ [enable_hooks="no"] ) AM_CONDITIONAL([HOOKS], [test "${enable_hooks}" = "yes"]) + +AC_ARG_ENABLE( + [rhev], + [AS_HELP_STRING( + [--enable-rhev], + [build RHEV version @<:@default=no@:>@] + )], + , + [enable_rhev="no"] +) AM_CONDITIONAL([RHEV], [test "${enable_rhev}" = "yes"]) AC_ARG_ENABLE( -- To view, visit http://gerrit.ovirt.org/35796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b253be2710bc979e3e14f1525f0157a0e65440f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>

3 6

Change in vdsm[master]: Restore the default value of rhev_build in the spec file
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has uploaded a new change for review. Change subject: Restore the default value of rhev_build in the spec file ...................................................................... Restore the default value of rhev_build in the spec file Change-Id: I8deca956e80bcacad1e6446975fe916d9247abdd Signed-off-by: Martin Sivak <mars(a)montik.net> --- M vdsm.spec.in 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/35794/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 7f878c2..7388aae 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -15,6 +15,9 @@ # Fedora official build %global fedora_koji_build 0 +# RHEV build - overridable using rpmbuild --define "rhev_build 1" +%{!?rhev_build: %global rhev_build 0} + # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -- To view, visit http://gerrit.ovirt.org/35794 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8deca956e80bcacad1e6446975fe916d9247abdd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msivak(a)redhat.com>

3 5

Change in vdsm[master]: sampling: live merge: avoid wasteful picklecopy
by fromani＠redhat.com 05 Dec '14

05 Dec '14

Francesco Romani has uploaded a new change for review. Change subject: sampling: live merge: avoid wasteful picklecopy ...................................................................... sampling: live merge: avoid wasteful picklecopy The Vm.queryBlockJobs() API always return a fresh dictionary, so it is safe to copy it directly, saving a picklecopy. Change-Id: I1b23e42f14f9d334734ee1c77c9d11c33afe5aec Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/35621/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index adad036..5d1c785 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -550,7 +550,7 @@ stats['vNodeRuntimeInfo'] = vmNumaNodeRuntimeMap def _getVmJobs(self, stats): - info = utils.picklecopy(self.sampleVmJobs.getLastSample()) + info = self.sampleVmJobs.getLastSample() if info is not None: # If we are unable to collect stats we must not return anything at # all since an empty dictionary would be interpreted as vm jobs -- To view, visit http://gerrit.ovirt.org/35621 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b23e42f14f9d334734ee1c77c9d11c33afe5aec Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 7

Change in vdsm[master]: virt: log.error(exc_info=True) -> log.exception()
by fromani＠redhat.com 05 Dec '14

05 Dec '14

Francesco Romani has uploaded a new change for review. Change subject: virt: log.error(exc_info=True) -> log.exception() ...................................................................... virt: log.error(exc_info=True) -> log.exception() This patch just replaces the occurrences of log.error('something', exc_info=True) with the recommended idiom log.exception('something'). No changes in behaviour. Change-Id: I675d4dda74e2eaff05f127836c821d1c7d0a2b53 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/guestagent.py M vdsm/virt/migration.py M vdsm/virt/sampling.py M vdsm/virt/vm.py 4 files changed, 52 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/34353/1 diff --git a/vdsm/virt/guestagent.py b/vdsm/virt/guestagent.py index 0be7e6b..32c7756 100644 --- a/vdsm/virt/guestagent.py +++ b/vdsm/virt/guestagent.py @@ -353,7 +353,7 @@ self.log.debug("desktopLock called") self._forward("lock-screen") except: - self.log.error("desktopLock failed", exc_info=True) + self.log.exception("desktopLock failed") def desktopLogin(self, domain, user, password): try: @@ -365,14 +365,14 @@ self._forward('login', {'username': username, "password": password}) except: - self.log.error("desktopLogin failed", exc_info=True) + self.log.exception("desktopLogin failed") def desktopLogoff(self, force): try: self.log.debug("desktopLogoff called") self._forward('log-off') except: - self.log.error("desktopLogoff failed", exc_info=True) + self.log.exception("desktopLogoff failed") def desktopShutdown(self, timeout, msg, reboot): try: @@ -380,14 +380,14 @@ self._forward('shutdown', {'timeout': timeout, 'message': msg, 'reboot': str(reboot)}) except: - self.log.error("desktopShutdown failed", exc_info=True) + self.log.exception("desktopShutdown failed") def sendHcCmdToDesktop(self, cmd): try: self.log.debug("sendHcCmdToDesktop('%s')" % (cmd)) self._forward(str(cmd)) except: - self.log.error("sendHcCmdToDesktop failed", exc_info=True) + self.log.exception("sendHcCmdToDesktop failed") def setNumberOfCPUs(self, count): self.log.debug("setNumberOfCPUs('%d') called", count) diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 9e09ed4..1fb44f8 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -125,7 +125,7 @@ self.log.error("Machine already exists on the destination") self.status = errCode['exist'] except Exception: - self.log.error("Error initiating connection", exc_info=True) + self.log.exception("Error initiating connection") self.status = errCode['noConPeer'] def _setupRemoteMachineParams(self): @@ -180,7 +180,7 @@ try: self.destServer.destroy(self._vm.id) except Exception: - self.log.error("Failed to destroy remote VM", exc_info=True) + self.log.exception("Failed to destroy remote VM") # if the guest was stopped before migration, we need to cont it if self.hibernating: self._vm.cont() @@ -274,7 +274,7 @@ SourceThread._ongoingMigrations.release() except Exception as e: self._recover(str(e)) - self.log.error("Failed to migrate", exc_info=True) + self.log.exception("Failed to migrate") def _startUnderlyingMigration(self, startTime): if self.hibernating: diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index 411111a..ad3d814 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -470,8 +470,8 @@ statsFunction() except Exception as e: if not self.handleStatsException(e): - self._log.error("Stats function failed: %s", - statsFunction, exc_info=True) + self._log.exception("Stats function failed: %s", + statsFunction) self._stopEvent.wait(waitInterval) intervalAccum = (intervalAccum + waitInterval) % maxInterval @@ -525,12 +525,11 @@ if len(self._samples) > self.AVERAGING_WINDOW: self._samples.pop(0) except vm.TimeoutError: - self._log.error("Timeout while sampling stats", - exc_info=True) + self._log.exception("Timeout while sampling stats") self._stopEvent.wait(self.SAMPLE_INTERVAL_SEC) except: if not self._stopEvent.isSet(): - self._log.error("Error while sampling stats", exc_info=True) + self._log.exception("Error while sampling stats") @utils.memoized def _boot_time(self): @@ -539,7 +538,7 @@ try: return getBootTime() except (IOError, ValueError): - self._log.error('Failed to get boot time', exc_info=True) + self._log.exception('Failed to get boot time') return None def get(self): diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 8b6c956..daa21e3 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -1848,7 +1848,7 @@ if self.recovering: self.log.info("Skipping errors on recovery", exc_info=True) else: - self.log.error("The vm start process failed", exc_info=True) + self.log.exception("The vm start process failed") self.setDownStatus(ERROR, vmexitreason.GENERIC_ERROR, str(e)) def _incomingMigrationPending(self): @@ -1958,7 +1958,7 @@ self._ejectFloppy() self.log.debug('ejected volatileFloppy') except Exception: - self.log.error("Reboot event failed", exc_info=True) + self.log.exception("Reboot event failed") def onConnect(self, clientIp=''): if clientIp: @@ -2318,8 +2318,8 @@ try: self.cif.teardownVolumePath(drive) except Exception: - self.log.error("Drive teardown failure for %s", - drive, exc_info=True) + self.log.exception("Drive teardown failure for %s", + drive) def _cleanupFloppy(self): """ @@ -2450,7 +2450,7 @@ config.getint('vars', 'vm_command_timeout')): stats['monitorResponse'] = '-1' except Exception: - self.log.error("Error fetching vm stats", exc_info=True) + self.log.exception("Error fetching vm stats") for var in decStats: if var == "ioTune": # Convert ioTune numbers to strings to avoid xml-rpc issue @@ -2471,8 +2471,7 @@ stats['disks'][var][value] = \ utils.convertToStr(decStats[var][value]) except Exception: - self.log.error("Error setting vm disk stats", - exc_info=True) + self.log.exception("Error setting vm disk stats") stats.update(self._getGraphicsStats()) stats['hash'] = str(hash((self._devXmlHash, @@ -2965,7 +2964,7 @@ try: self._dom.attachDevice(nicXml) except libvirt.libvirtError as e: - self.log.error("Hotplug failed", exc_info=True) + self.log.exception("Hotplug failed") nicXml = hooks.after_nic_hotplug_fail( nicXml, self.conf, params=nic.custom) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: @@ -2996,8 +2995,8 @@ # I am not sure that we'll get it for all traffic control errors. # In any case we need below rollback for all kind of failures. except Exception as e: - self.log.error("setPortMirroring for network %s failed", - network, exc_info=True) + self.log.exception("setPortMirroring for network %s failed", + network) nicParams['portMirroring'] = mirroredNetworks self.hotunplugNic({'nic': nicParams}) return {'status': @@ -3136,12 +3135,11 @@ mirroredNetworks.append(network) yield except Exception as e: - self.log.error( + self.log.exception( "%s for network %s failed", 'setPortMirroring' if network in netsToAdd else 'unsetPortMirroring', - network, - exc_info=True) + network) # In case we fail, we rollback the Network mirroring. for network in mirroredNetworks: supervdsm.getProxy().unsetPortMirroring(network, devName) @@ -3216,7 +3214,7 @@ try: self._dom.detachDevice(nicXml) except libvirt.libvirtError as e: - self.log.error("Hotunplug failed", exc_info=True) + self.log.exception("Hotunplug failed") if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] # Restore NIC device in vm's conf and _devices @@ -3247,7 +3245,7 @@ self._dom.setVcpusFlags(numberOfCpus, libvirt.VIR_DOMAIN_AFFECT_CURRENT) except libvirt.libvirtError as e: - self.log.error("setNumberOfCpus failed", exc_info=True) + self.log.exception("setNumberOfCpus failed") if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] return {'status': {'code': errCode['setNumberOfCpusErr'] @@ -3481,8 +3479,8 @@ os.fchmod(transientHandle, 0o660) except Exception: os.unlink(transientPath) # Closing after deletion is correct - self.log.error("Failed to create the transient disk for " - "volume %s", diskParams['volumeID'], exc_info=True) + self.log.exception("Failed to create the transient disk for " + "volume %s", diskParams['volumeID']) finally: os.close(transientHandle) @@ -3519,7 +3517,7 @@ try: self._dom.attachDevice(driveXml) except libvirt.libvirtError as e: - self.log.error("Hotplug failed", exc_info=True) + self.log.exception("Hotplug failed") self.cif.teardownVolumePath(diskParams) if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] @@ -3583,7 +3581,7 @@ try: self._dom.detachDevice(driveXml) except libvirt.libvirtError as e: - self.log.error("Hotunplug failed", exc_info=True) + self.log.exception("Hotunplug failed") if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return errCode['noVM'] self._devices[DISK_DEVICES].append(drive) @@ -3836,8 +3834,8 @@ try: self.cif.teardownVolumePath(drive) except Exception: - self.log.error("Unable to teardown drive: %s", vmDevName, - exc_info=True) + self.log.exception("Unable to teardown drive: %s", + vmDevName) def _memorySnapshot(memoryVolumePath): """Libvirt snapshot XML""" @@ -3989,7 +3987,7 @@ try: self._dom.snapshotCreateXML(snapxml, snapFlags) except Exception as e: - self.log.error("Unable to take snapshot", exc_info=True) + self.log.exception("Unable to take snapshot") if memoryParams: self.cif.teardownVolumePath(memoryVol) return errCode['snapshotErr'] @@ -4009,8 +4007,8 @@ # Here it's too late to fail, the switch already happened # and there's nothing we can do, we must to proceed anyway # to report the live snapshot success. - self.log.error("Failed to update drive information for " - "'%s'", drive, exc_info=True) + self.log.exception("Failed to update drive information" + " for '%s'", drive) finally: self.startDisksStatsCollection() if memoryParams: @@ -4098,13 +4096,13 @@ libvirt.VIR_DOMAIN_BLOCK_REBASE_SHALLOW )) except Exception: - self.log.error("Unable to start the replication for %s to %s", - srcDrive.name, dstDiskCopy, exc_info=True) + self.log.exception("Unable to start the replication" + " for %s to %s", + srcDrive.name, dstDiskCopy) self.cif.teardownVolumePath(dstDiskCopy) raise except Exception: - self.log.error("Cannot complete the disk replication process", - exc_info=True) + self.log.exception("Cannot complete the disk replication process") self._delDiskReplica(srcDrive) return errCode['replicaErr'] @@ -4112,8 +4110,8 @@ self.extendDriveVolume(srcDrive, srcDrive.volumeID, srcDrive.apparentsize) except Exception: - self.log.error("Initial extension request failed for %s", - srcDrive.name, exc_info=True) + self.log.exception("Initial extension request failed for %s", + srcDrive.name) return {'status': doneCode} @@ -4178,22 +4176,22 @@ # Stopping the replication self._dom.blockJobAbort(srcDrive.name, blockJobFlags) except Exception: - self.log.error("Unable to stop the replication for the drive: %s", - srcDrive.name, exc_info=True) + self.log.exception("Unable to stop the replication for" + " the drive: %s", srcDrive.name) try: self.cif.teardownVolumePath(srcDrive.diskReplicate) except Exception: # There is nothing we can do at this point other than logging - self.log.error("Unable to teardown the replication " - "destination disk", exc_info=True) + self.log.exception("Unable to teardown the replication " + "destination disk") return errCode['changeDisk'] # Finally is evaluated else: try: self.cif.teardownVolumePath(diskToTeardown) except Exception: # There is nothing we can do at this point other than logging - self.log.error("Unable to teardown the previous chain: %s", - diskToTeardown, exc_info=True) + self.log.exception("Unable to teardown the previous chain: %s", + diskToTeardown) self.updateDriveParameters(dstDiskCopy) finally: self._delDiskReplica(srcDrive) @@ -4224,9 +4222,9 @@ self._dom.blockResize(drive.name, newSizeBytes, libvirt.VIR_DOMAIN_BLOCK_RESIZE_BYTES) except libvirt.libvirtError: - self.log.error( + self.log.exception( "An error occurred while trying to extend the disk %s " - "to size %s", drive.name, newSizeBytes, exc_info=True) + "to size %s", drive.name, newSizeBytes) return errCode['updateDevice'] finally: # In all cases we want to try and fix the size in the metadata. @@ -4290,8 +4288,8 @@ else: return self._diskSizeExtendRaw(drive, newSizeBytes) except Exception: - self.log.error("Unable to extend disk %s to size %s", - drive.name, newSizeBytes, exc_info=True) + self.log.exception("Unable to extend disk %s to size %s", + drive.name, newSizeBytes) return errCode['updateDevice'] @@ -4551,8 +4549,7 @@ self.log.debug("Total desktops after destroy of %s is %d", self.conf['vmId'], len(self.cif.vmContainer)) except Exception: - self.log.error("Failed to delete VM %s", self.conf['vmId'], - exc_info=True) + self.log.exception("Failed to delete VM %s", self.conf['vmId']) def destroy(self): self.log.debug('destroy Called') -- To view, visit http://gerrit.ovirt.org/34353 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I675d4dda74e2eaff05f127836c821d1c7d0a2b53 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

3 6

Change in vdsm[master]: jsonrpc: VM_updateVmPolicy
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has posted comments on this change. Change subject: jsonrpc: VM_updateVmPolicy ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/35556 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I39c3e0a675b0574c25a2602f672ed6a36a05547c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: jsonrpc: VM_setIoTune
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has posted comments on this change. Change subject: jsonrpc: VM_setIoTune ...................................................................... Patch Set 2: Code-Review-1 (1 comment) http://gerrit.ovirt.org/#/c/35554/2/vdsm/rpc/Bridge.py File vdsm/rpc/Bridge.py: Line 463: 'VM_pause': {'ret': VM_running_state_change_Ret}, Line 464: 'VM_setCpuTunePeriod': {'ret': 'taskStatus'}, Line 465: 'VM_setCpuTuneQuota': {'ret': 'taskStatus'}, Line 466: 'VM_setNumberOfCpus': {'ret': 'vmList'}, Line 467: 'VM_setIoTune': {'ret': 'vmList'}, setIoTune resturns task status. Line 468: 'VM_updateDevice': {'ret': 'vmList'}, Line 469: 'Volume_copy': {'ret': 'uuid'}, Line 470: 'Volume_create': {'ret': 'uuid'}, Line 471: 'Volume_delete': {'ret': 'uuid'}, -- To view, visit http://gerrit.ovirt.org/35554 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a4827dd6dac84eed0430ee6e433f1b0b403dd81 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: jsonrpc: VM_setCpuTuneQuota
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has posted comments on this change. Change subject: jsonrpc: VM_setCpuTuneQuota ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/35553 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I397d12419ff1e108c57ad6098f7ca1be5ef44711 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: jsonrpc: VM_setCpuTunePeriod
by Martin Sivak 05 Dec '14

05 Dec '14

Martin Sivák has posted comments on this change. Change subject: jsonrpc: VM_setCpuTunePeriod ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/35552 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iac8159c951bb9b85914a51e78e9678c2918097b6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: hooks: Include sudoers file in ethtool_options rpm
by dkuznets＠redhat.com 05 Dec '14

05 Dec '14

Dima Kuznetsov has uploaded a new change for review. Change subject: hooks: Include sudoers file in ethtool_options rpm ...................................................................... hooks: Include sudoers file in ethtool_options rpm The hook contained the file and the rules to install it but never invoked the as part of the build. Change-Id: I3f1529452050370c82eb2a2675b74c2e5136d427 Signed-off-by: Dima Kuznetsov <dkuznets(a)redhat.com> --- M debian/vdsm-hook-ethtool-options.install M vdsm.spec.in M vdsm_hooks/ethtool_options/Makefile.am 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/35725/1 diff --git a/debian/vdsm-hook-ethtool-options.install b/debian/vdsm-hook-ethtool-options.install index 4f93300..3609f3a 100644 --- a/debian/vdsm-hook-ethtool-options.install +++ b/debian/vdsm-hook-ethtool-options.install @@ -1 +1,2 @@ usr/libexec/vdsm/hooks/after_network_setup/30_ethtool_options +etc/sudoers.d/50_vdsm_hook_ethtool_options diff --git a/vdsm.spec.in b/vdsm.spec.in index 86a43c7..fcfe717 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1380,6 +1380,7 @@ %files hook-ethtool-options %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/after_network_setup/30_ethtool_options +%{_sysconfdir}/sudoers.d/50_vdsm_hook_ethtool_options %files hook-ipv6 %defattr(-, root, root, -) diff --git a/vdsm_hooks/ethtool_options/Makefile.am b/vdsm_hooks/ethtool_options/Makefile.am index c6b108b..220675c 100644 --- a/vdsm_hooks/ethtool_options/Makefile.am +++ b/vdsm_hooks/ethtool_options/Makefile.am @@ -19,14 +19,16 @@ # EXTRA_DIST = \ - ethtool_options.py + ethtool_options.py \ + sudoers \ + $(NULL) -install-data-local: +install-data-local: install-data-sudoers $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/after_network_setup $(INSTALL_SCRIPT) $(srcdir)/ethtool_options.py \ $(DESTDIR)$(vdsmhooksdir)/after_network_setup/30_ethtool_options -uninstall-local: +uninstall-local: uninstall-data-sudoers $(RM) $(DESTDIR)$(vdsmhooksdir)/after_network_setup/30_ethtool_options install-data-sudoers: -- To view, visit http://gerrit.ovirt.org/35725 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f1529452050370c82eb2a2675b74c2e5136d427 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuznets(a)redhat.com>

5 16

Change in vdsm[master]: vdscli: 'port' argument must be an int
by fromani＠redhat.com 05 Dec '14

05 Dec '14

Francesco Romani has uploaded a new change for review. Change subject: vdscli: 'port' argument must be an int ...................................................................... vdscli: 'port' argument must be an int The 'port' parameter of the cannonizeHostPort function should be an int, not a string, and should be treated as such. This patch fixes the code to so, removing TODOs along the way. Change-Id: Ic2af987cc0a381e10d898888562865f877a24686 Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/vdscli.py M tests/vdsClientTests.py M vdsm/clientIF.py M vdsm/virt/migration.py 4 files changed, 12 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/35273/1 diff --git a/lib/vdsm/vdscli.py b/lib/vdsm/vdscli.py index d4bd39a..2908775 100644 --- a/lib/vdsm/vdscli.py +++ b/lib/vdsm/vdscli.py @@ -30,7 +30,7 @@ _USE_SSL = False _TRUSTED_STORE_PATH = '/etc/pki/vdsm' _ADDRESS = '0' -_PORT = '54321' +_PORT = 54321 def wrap_transport(transport): @@ -67,7 +67,7 @@ config.read(VDSM_CONF) _USE_SSL = config.getboolean('vars', 'ssl') _TRUSTED_STORE_PATH = config.get('vars', 'trust_store_path') - _PORT = config.get('addresses', 'management_port') + _PORT = config.getint('addresses', 'management_port') _ADDRESS = config.get('addresses', 'management_ip') except: pass @@ -86,9 +86,10 @@ # hostPort is in rfc3986 'host [ ":" port ]' format hostPort = re.match(r'(?P<Host>.+?)(:(?P<Port>\d+))?$', hostPort) addr = hostPort.group('Host') - port = hostPort.group('Port') or port + if hostPort.group('Port'): + port = int(hostPort.group('Port')) - return addr + ':' + port + return '%s:%i' % (addr, port) def connect(hostPort=None, useSSL=None, tsPath=None, diff --git a/tests/vdsClientTests.py b/tests/vdsClientTests.py index aee4fa7..071da94 100644 --- a/tests/vdsClientTests.py +++ b/tests/vdsClientTests.py @@ -546,11 +546,11 @@ self.assertIsIpAddressWithPort(vdscli.cannonizeHostPort(None)) def testNoneArgumentAndPort(self): - port = '65432' + port = 65432 res = vdscli.cannonizeHostPort(None, port) self.assertIsIpAddressWithPort(res) # address must include the given port - self.assertTrue(res.endswith(port)) + self.assertTrue(res.endswith(str(port))) def testEmptyAddress(self): # FIXME: fix cannonizeHostPort to handle this error or to @@ -571,18 +571,16 @@ self.assertTrue(res.endswith(str(port))) def testAddressWithPortParameter(self): - # TODO: fix cannonizeHostPort to require port as int addr = '127.0.0.1' - port = '65432' + port = 65432 res = vdscli.cannonizeHostPort(addr, port) self.assertIsIpAddressWithPort(res) # address must include the given port - self.assertTrue(res.endswith(port)) + self.assertTrue(res.endswith(str(port))) def testAddressWithBadPortParameter(self): - # TODO: fix cannonizeHostPort to require port as int addr = '127.0.0.1' - port = 65432 + port = '65432' self.assertRaises(TypeError, vdscli.cannonizeHostPort, addr, port) diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index a17fd20..f16a096 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -104,7 +104,7 @@ self.threadLocal.client = '' host = config.get('addresses', 'management_ip') - port = config.get('addresses', 'management_port') + port = config.getint('addresses', 'management_port') self._createAcceptor(host, port) self._prepareXMLRPCBinding() self._prepareJSONRPCBinding() diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 2d890c0..7015c16 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -107,7 +107,7 @@ # This assumes xmlrpc hostPort = vdscli.cannonizeHostPort( self._dst, - config.get('addresses', 'management_port')) + config.getint('addresses', 'management_port')) self.remoteHost, _ = hostPort.rsplit(':', 1) if config.getboolean('vars', 'ssl'): -- To view, visit http://gerrit.ovirt.org/35273 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2af987cc0a381e10d898888562865f877a24686 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

5 14

← Newer
1
...
65
66
67
68
69
70
71
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2014