Francesco Romani has uploaded a new change for review.
Change subject: virt: stats: simplify the getStatsInternal flow
......................................................................
virt: stats: simplify the getStatsInternal flow
this patch simplifies the flow in getStatsInternal
to make room for future changes. No functional changes
intended.
Change-Id: I22650dc87170a3dbbd0e2552a33ae4209d773183
Signed-off-by: Francesco Romani <from...@redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 20 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/26553/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 7c424a6..922595e 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2405,29 +2405,28 @@
def _getStatsInternal(self):
# used by API.Vm.getStats
-
- if self.lastStatus == vmstatus.DOWN:
- stats = {}
- self._addExitedVmStats(stats)
- return stats
-
stats = {}
- self._addStaticVmStats(stats)
- self._addDynamicVmStats(stats)
- self._addVmStatusStats(stats)
+ if self.lastStatus == vmstatus.DOWN:
+ self._addExitedVmStats(stats)
+ else:
+ self._addStaticVmStats(stats)
+ self._addDynamicVmStats(stats)
+ self._addVmStatusStats(stats)
- try:
- stats.update(self.guestAgent.getGuestInfo())
- except Exception:
- return stats
- memUsage = 0
- realMemUsage = int(stats['memUsage'])
- if realMemUsage != 0:
- memUsage = (100 - float(realMemUsage) /
- int(self.conf['memSize']) * 100)
- stats['memUsage'] = utils.convertToStr(int(memUsage))
- stats['balloonInfo'] = self._getBalloonInfo()
- self._addMigrationVmStats(stats)
+ try:
+ stats.update(self.guestAgent.getGuestInfo())
+ except Exception:
+ return stats
+ memUsage = 0
+ realMemUsage = int(stats['memUsage'])
+ if realMemUsage != 0:
+ memUsage = (100 - float(realMemUsage) /
+ int(self.conf['memSize']) * 100)
+ stats['memUsage'] = utils.convertToStr(int(memUsage))
+
+ stats['balloonInfo'] = self._getBalloonInfo()
+
+ self._addMigrationVmStats(stats)
return stats
def _addExitedVmStats(self, stats):
--
To view, visit http://gerrit.ovirt.org/26553
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22650dc87170a3dbbd0e2552a33ae4209d773183
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <from...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
