diff --git a/LSF-Script/node/nodeSample b/LSF-Script/node/nodeSample index 0649eb170740a67029d80e8e6f4884bf2e4af89d..21acfd06b214d0846df4159e7e364df6d0ef213b 100644 --- a/LSF-Script/node/nodeSample +++ b/LSF-Script/node/nodeSample @@ -6,7 +6,7 @@ import os import time LSLOAD_CMD = 'source @SCHEDULER_PROFILE_PATH@;' \ - 'timeout 10 lsload -w' + 'timeout 10 lsload -l' nodeloads = os.popen(LSLOAD_CMD).read() nodeloadstr = nodeloads.split("\n") @@ -15,15 +15,6 @@ for index in range(1, len(nodeloadstr) - 1): temp=dict(zip(nodeloadstr[0].split(),nodeloadstr[index].split())) nodes.append(temp) -LSLOAD_CMD = 'source @SCHEDULER_PROFILE_PATH@;' \ - 'timeout 10 lsload -o "HOST_NAME io"' - -nodeioloads = os.popen(LSLOAD_CMD).read() -nodeioloadstr = nodeioloads.split("\n") -nodesio = {} -for index in range(1, len(nodeloadstr) - 1): - nodesio[nodeioloadstr[index].split(" ")[0]] = nodeioloadstr[index].split(" ")[1] - BHOSTS_CMD = 'source @SCHEDULER_PROFILE_PATH@;' \ 'timeout 10 bhosts -w' bhosts = os.popen(BHOSTS_CMD).read() @@ -81,7 +72,7 @@ result = time.localtime(time.mktime(timeresult)) sampletime = time.strftime('%Y/%m/%d %H:%M:%S',result) nodeinfoTmp = {'status': None, 'tmp': None, 'mem': None, 'r15m': None, 'r15s': None, 'ls': None, 'it': None, - 'HOST_NAME': None, 'ut': None, 'swp': None, 'r1m': None, 'pg': None} + 'HOST_NAME': None, 'ut': None, 'swp': None, 'r1m': None, 'pg': None, 'io' : None} for nodeinfo in nodes: for key in nodeinfo.keys(): nodeinfoTmp[key] = nodeinfo[key] @@ -107,7 +98,7 @@ for nodeinfo in nodes: "tmpFree": int(float(nodeinfoTmp['tmp'][:-1])) if nodeinfoTmp['tmp'] != None else None, "cpuUtil": float(nodeinfoTmp['ut'][:-1]) / 100 if nodeinfoTmp['ut'] != None else None, "loadAverage": None, - "ioRate": nodesio[nodeinfoTmp['HOST_NAME']] if nodesio[nodeinfoTmp['HOST_NAME']] != '-' else None, + "ioRate": nodeinfoTmp['io'] if nodeinfoTmp['io'] != '-' else None, "pageRate": nodeinfoTmp['pg'] if nodeinfoTmp['pg'] != None else None, "idleTime": None, "belongResourcePool": None, diff --git a/LSF-Script/queue/query-active b/LSF-Script/queue/query-active index 5b286a8f0f7ebf00ecaa7ed8c60096b171c077d6..2d3db8f7a74c14ac7eed74abe9afd1d7dac0473c 100644 --- a/LSF-Script/queue/query-active +++ b/LSF-Script/queue/query-active @@ -15,4 +15,4 @@ else exit 2 fi -timeout 10 bqueues -o "QUEUE_NAME" \ No newline at end of file +timeout 10 bqueues | awk '{print $1}' \ No newline at end of file