Francesco Romani has uploaded a new change for review. Change subject: virt: stats: move dynamic stats in a method ......................................................................
virt: stats: move dynamic stats in a method this patch moves the handling of the stats coming from the VmStatsThread in a separate method. No functional changes. Change-Id: I5a2b7658c209a3dcdd6df46052440204ad52a5d3 Signed-off-by: Francesco Romani <[email protected]> --- M vdsm/virt/vm.py 1 file changed, 27 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/26548/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 3487271..d28d7f2 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -2440,30 +2440,7 @@ if 'boot' in self.conf: stats['boot'] = self.conf['boot'] - decStats = {} - try: - if self._vmStats: - decStats = self._vmStats.get() - if (not self.isMigrating() - and decStats['statsAge'] > - config.getint('vars', 'vm_command_timeout')): - stats['monitorResponse'] = '-1' - except Exception: - self.log.error("Error fetching vm stats", exc_info=True) - for var in decStats: - if type(decStats[var]) is not dict: - stats[var] = utils.convertToStr(decStats[var]) - elif var == 'network': - stats['network'] = decStats[var] - else: - try: - stats['disks'][var] = {} - for value in decStats[var]: - stats['disks'][var][value] = \ - utils.convertToStr(decStats[var][value]) - except Exception: - self.log.error("Error setting vm disk stats", - exc_info=True) + self._addDynamicVmStats(stats) statuses = (vmstatus.SAVING_STATE, vmstatus.RESTORING_STATE, vmstatus.MIGRATION_SOURCE, vmstatus.MIGRATION_DESTINATION, @@ -2507,6 +2484,32 @@ if 'timeOffset' in self.conf: stats['timeOffset'] = self.conf['timeOffset'] + def _addDynamicVmStats(self, stats): + decStats = {} + try: + if self._vmStats: + decStats = self._vmStats.get() + if (not self.isMigrating() + and decStats['statsAge'] > + config.getint('vars', 'vm_command_timeout')): + stats['monitorResponse'] = '-1' + except Exception: + self.log.error("Error fetching vm stats", exc_info=True) + for var in decStats: + if type(decStats[var]) is not dict: + stats[var] = utils.convertToStr(decStats[var]) + elif var == 'network': + stats['network'] = decStats[var] + else: + try: + stats['disks'][var] = {} + for value in decStats[var]: + stats['disks'][var][value] = \ + utils.convertToStr(decStats[var][value]) + except Exception: + self.log.error("Error setting vm disk stats", + exc_info=True) + def isMigrating(self): return self._migrationSourceThread.isAlive() -- To view, visit http://gerrit.ovirt.org/26548 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a2b7658c209a3dcdd6df46052440204ad52a5d3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
