diff options
3 files changed, 33 insertions, 1 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 a212f104..46e4cdd4 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/Utils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/Utils.py @@ -1074,3 +1074,13 @@ def getDeviceFormatLockFile(device): def getDeviceFormatOutputFile(device): return "/var/tmp/format_%s.out" % device.replace('/', '_') + +def getGlusterVersion(): + rv = runCommand("/usr/sbin/gluster --version", output=True) + if rv["Stderr"]: + return None + if rv["Status"] != 0: + return None + if not rv["Stdout"]: + return None + return rv["Stdout"].strip().split()[1] diff --git a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py index f9c1652f..30ffac58 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/get_server_details.py @@ -50,6 +50,7 @@ def getServerDetails(listall): serverTag.appendChild(responseDom.createTag("status", "ONLINE")) else: serverTag.appendChild(responseDom.createTag("status", "OFFLINE")) + serverTag.appendChild(responseDom.createTag("glusterFsVersion", Utils.getGlusterVersion())) serverTag.appendChild(responseDom.createTag("cpuUsage", str(cpu))) serverTag.appendChild(responseDom.createTag("totalMemory", str(convertKbToMb(meminfo['MemTotal'])))) serverTag.appendChild(responseDom.createTag("memoryInUse", str(convertKbToMb(meminfo['MemUsed'])))) 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 aaef5afe..46e4cdd4 100644 --- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py +++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py @@ -409,7 +409,11 @@ def getCpuUsageAvg(): if not (st1 and st2): return None delta = [st2[i] - st1[i] for i in range(len(st1))] - cpuPercent = sum(delta[:3]) / delta[3] * 100.0 + try: + cpuPercent = sum(delta[:3]) / delta[3] * 100.0 + except ZeroDivisionError, e: + log("failed to find cpu percentage:%s" % str(e)) + return None return str('%.4f' % cpuPercent) def getLoadavg(): @@ -448,6 +452,13 @@ def getInfinibandPortStatus(): return portkeys +def getServerFqdn(): + rv = runCommand("hostname --fqdn", output=True, root=True) + if not rv["Stderr"]: + return stripEmptyLines(rv["Stdout"]) + return socket.gethostname() + + def getServerCount(): try: return int(open(Globals.SERVER_COUNT_FILE).read().strip()) @@ -1063,3 +1074,13 @@ def getDeviceFormatLockFile(device): def getDeviceFormatOutputFile(device): return "/var/tmp/format_%s.out" % device.replace('/', '_') + +def getGlusterVersion(): + rv = runCommand("/usr/sbin/gluster --version", output=True) + if rv["Stderr"]: + return None + if rv["Status"] != 0: + return None + if not rv["Stdout"]: + return None + return rv["Stdout"].strip().split()[1] |