|
 |
3d61c0 |
From a0d4d3338e4c21bdbfb6a6498c605fdd85376073 Mon Sep 17 00:00:00 2001
|
|
|
3d61c0 |
Message-Id: <a0d4d3338e4c21bdbfb6a6498c605fdd85376073@dist-git>
|
|
|
3d61c0 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
3d61c0 |
Date: Fri, 9 Feb 2018 14:02:04 -0500
|
|
|
3d61c0 |
Subject: [PATCH] manager: Fix mem, disk, net stats graphs (bz 1543896)
|
|
|
3d61c0 |
|
|
|
3d61c0 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
3d61c0 |
|
|
|
3d61c0 |
python2/3 division compat messed this up
|
|
|
3d61c0 |
|
|
|
3d61c0 |
https://bugzilla.redhat.com/show_bug.cgi?id=1543896
|
|
|
3d61c0 |
(cherry picked from commit 4c7c45908f6afd4e0edae9923218472d353caa3a)
|
|
|
3d61c0 |
|
|
|
3d61c0 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1710772
|
|
|
3d61c0 |
|
|
|
3d61c0 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
3d61c0 |
Reviewed-by: Cole Robinson <crobinso@redhat.com>
|
|
|
3d61c0 |
---
|
|
|
3d61c0 |
virtManager/domain.py | 2 +-
|
|
|
3d61c0 |
virtManager/manager.py | 4 ++--
|
|
|
3d61c0 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
3d61c0 |
|
|
|
3d61c0 |
diff --git a/virtManager/domain.py b/virtManager/domain.py
|
|
|
3d61c0 |
index c423a177..a0f40352 100644
|
|
|
3d61c0 |
--- a/virtManager/domain.py
|
|
|
3d61c0 |
+++ b/virtManager/domain.py
|
|
|
3d61c0 |
@@ -1982,7 +1982,7 @@ class vmmDomain(vmmLibvirtObject):
|
|
|
3d61c0 |
except libvirt.libvirtError as err:
|
|
|
3d61c0 |
logging.error("Error reading mem stats: %s", err)
|
|
|
3d61c0 |
|
|
|
3d61c0 |
- pcentCurrMem = (curmem // float(totalmem)) * 100
|
|
|
3d61c0 |
+ pcentCurrMem = (curmem / float(totalmem)) * 100
|
|
|
3d61c0 |
pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0))
|
|
|
3d61c0 |
|
|
|
3d61c0 |
return pcentCurrMem, curmem
|
|
|
3d61c0 |
diff --git a/virtManager/manager.py b/virtManager/manager.py
|
|
|
3d61c0 |
index d6640fbc..d38fc4e4 100644
|
|
|
3d61c0 |
--- a/virtManager/manager.py
|
|
|
3d61c0 |
+++ b/virtManager/manager.py
|
|
|
3d61c0 |
@@ -1068,7 +1068,7 @@ class vmmManager(vmmGObjectUI):
|
|
|
3d61c0 |
return
|
|
|
3d61c0 |
|
|
|
3d61c0 |
d1, d2 = obj.disk_io_vectors(GRAPH_LEN, self.max_disk_rate)
|
|
|
3d61c0 |
- data = [(x + y) // 2 for x, y in zip(d1, d2)]
|
|
|
3d61c0 |
+ data = [(x + y) / 2 for x, y in zip(d1, d2)]
|
|
|
3d61c0 |
cell.set_property('data_array', data)
|
|
|
3d61c0 |
|
|
|
3d61c0 |
def network_traffic_img(self, column_ignore, cell, model, _iter, data):
|
|
|
3d61c0 |
@@ -1077,5 +1077,5 @@ class vmmManager(vmmGObjectUI):
|
|
|
3d61c0 |
return
|
|
|
3d61c0 |
|
|
|
3d61c0 |
d1, d2 = obj.network_traffic_vectors(GRAPH_LEN, self.max_net_rate)
|
|
|
3d61c0 |
- data = [(x + y) // 2 for x, y in zip(d1, d2)]
|
|
|
3d61c0 |
+ data = [(x + y) / 2 for x, y in zip(d1, d2)]
|
|
|
3d61c0 |
cell.set_property('data_array', data)
|
|
|
3d61c0 |
--
|
|
|
3d61c0 |
2.21.0
|
|
|
3d61c0 |
|