summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim <timothyasir@gluster.com>2011-08-10 14:50:47 +0530
committerTim <timothyasir@gluster.com>2011-08-10 14:50:47 +0530
commit3703bd97278a53e60b73b227b50db98d5e4b57dc (patch)
treeefb7b8f90e29d7de4e17b1ee650adf7d3412d753
parentd03d4570da36b01032e6e2b0c80f6c36b98bbe1f (diff)
Fixed used memory calculation error
Updated getMeminfo function to calculate used memory as (MemTotal - MemFree - Buffers -Cached)
-rw-r--r--src/com.gluster.storage.management.gateway.scripts/src/Utils.py2
-rw-r--r--src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
index be5df757..588d52fa 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py
@@ -374,7 +374,7 @@ def getMeminfo():
continue # skip lines that don't parse
key, value = match.groups(['key', 'value'])
result[key] = int(value)
- result['MemUsed'] = (result['MemTotal'] - result['MemFree'])
+ result['MemUsed'] = (result['MemTotal'] - result['MemFree'] - result['Buffers'] - result['Cached'])
return result
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
index be5df757..588d52fa 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
@@ -374,7 +374,7 @@ def getMeminfo():
continue # skip lines that don't parse
key, value = match.groups(['key', 'value'])
result[key] = int(value)
- result['MemUsed'] = (result['MemTotal'] - result['MemFree'])
+ result['MemUsed'] = (result['MemTotal'] - result['MemFree'] - result['Buffers'] - result['Cached'])
return result