From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 9 Mar 2015 11:45:54 +0000 (+0100)
Subject: Don't add memory usage to PBS logs, cleanups.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f24364c6094d83ad155a46b82c09c4b853b435cc;p=hadoop-jobstat.git

Don't add memory usage to PBS logs, cleanups.
---

diff --git a/stat2pbs.py b/stat2pbs.py
index c6cb412..c47ffb1 100755
--- a/stat2pbs.py
+++ b/stat2pbs.py
@@ -13,8 +13,7 @@ dbpassword = ''
 statfile = 'stat2pbs.txt'
 
 CLUSTER_HOSTNAME ='hador.ics.muni.cz'
-NODE_MEM=4
-NODE_VMEM=64
+NODE_VMEM=4
 REALM = 'META'
 
 
@@ -60,10 +59,6 @@ def gen_string(job):
 	else:
 		pbs_exit_status='exit_status=-1'
 
-	pbs_name = ''
-	pbs_submit = ''
-	pbs_qtime = ''
-	pbs_etime = ''
 	if job['submit']:
 		t = int(job['submit']) / 1000
 		pbs.append('ctime=%d' % t)
@@ -83,7 +78,7 @@ def gen_string(job):
 		pbs.append('exec_host=%s' % exec_host)
 
 		for i in range(len(joblist)):
-			joblist[i] = 'host=%s:ppn=1:mem=%dGB:vmem=%dGB' % (joblist[i], NODE_MEM, NODE_VMEM)
+			joblist[i] = 'host=%s:ppn=1:vmem=%dGB' % (joblist[i], NODE_VMEM)
 		sched_nodespec = '+'.join(joblist)
 		pbs.append('sched_nodespec=%s' % sched_nodespec)
 
@@ -95,7 +90,6 @@ def gen_string(job):
 		pbs.append('resources_used.cput=%s' % cput)
 
 	if jobnodes:
-		pbs.append('resource_used.mem=%dGB' % (len(joblist) * NODE_MEM))
 		pbs.append('resource_used.vmem=%dGB' % (len(joblist) * NODE_VMEM))
 
 	if job['finish']: