From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 5 Mar 2015 20:02:45 +0000 (+0100)
Subject: Fix node IDs in subjobs.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=32c193cd8bcb71a18c4533d35f47bbc6f0d47b29;p=hadoop-jobstat.git

Fix node IDs in subjobs.
---

diff --git a/jobs.py b/jobs.py
index ebd97fa..d6ebdce 100755
--- a/jobs.py
+++ b/jobs.py
@@ -376,6 +376,7 @@ for id, job in jobs.iteritems():
 						if regAtt.match(attempt['id']): attempt['id'] = regAtt.sub('', attempt['id'])
 
 						nodeHost = regHost.sub('', attempt['nodeHttpAddress'])
+						attempt['nodeHttpAddress'] = nodeHost
 						if nodeHost not in jobnodes:
 							jobnodes[nodeHost] = JobNode()
 						jobnodes[nodeHost].elapsed += attempt['elapsedTime']
@@ -410,6 +411,7 @@ for id, job in jobs.iteritems():
 
 		st.execute("DELETE FROM subjobs WHERE jobid=%s", id)
 		for subjob in subjobs:
+			nodename = subjob['nodeHttpAddress']
 			st.execute('INSERT INTO subjobs (id, jobid, nodeid, state, type, start, finish) VALUES (%s, %s, %s, %s, %s, %s, %s)', (subjob['id'], id, node_hosts[nodename].id, subjob['state'], subjob['type'], subjob['startTime'], subjob['finishTime']))
 		if debug >= 2: print '[db] job %s subjobs updated' % id