From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 6 Jan 2016 22:14:05 +0000 (+0100)
Subject: Tuning: better SQL, better output.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=baba12ebf744bf08d7725f64a5fa80ce073ad43d;p=hadoop-jobstat.git

Tuning: better SQL, better output.
---

diff --git a/HOWTO.sh b/HOWTO.sh
index dc9d992..8d63966 100755
--- a/HOWTO.sh
+++ b/HOWTO.sh
@@ -1,4 +1,7 @@
 # !/bin/sh
+#scp -p root@hador-c1:~/STAT-nodes/nodes.dat .
 ./chroust.py -i $((6*3600)) -c hador.txt > nodes.dat
 ./nodes.dem
 ./nodes-sum.dem
+
+term_x=800; term_y=500; gnuplot -e "set term pngcairo size ${term_x}, ${term_y}"  nodes-sum.dem > nodes-sum.png
diff --git a/chroust.py b/chroust.py
index af93919..747939f 100755
--- a/chroust.py
+++ b/chroust.py
@@ -137,7 +137,7 @@ i = min
 while i < max:
 	start = i
 	end = i + 1000 * interval
-	st.execute('SELECT * FROM subjobs WHERE finish >= %s AND start <= %s', (start, end))
+	st.execute('SELECT * FROM subjobs WHERE (finish >= %s OR finish = 0 OR finish IS NULL) AND start <= %s', (start, end))
 	#print '%s: %d subjobs' % (strp(i), st.rowcount)
 	subjobs = st.rowcount
 	nodes_usage = dict()
diff --git a/nodes-sum.dem b/nodes-sum.dem
index 5e1b699..bf234a4 100755
--- a/nodes-sum.dem
+++ b/nodes-sum.dem
@@ -1,9 +1,11 @@
 #! /usr/bin/gnuplot -p
 
+set title "Hadoop: Map/Reduce Jobs Summary" font ',16'
 set xdata time
 set timefmt "%Y-%m-%d %H:%M:%S"
 set format x "%Y-%m-%d"
 
 set xtics rotate by -20
 
-plot for [i=3:26] 'nodes.dat' using 1:(sum [col=4:i+1] column(col)) notitle with lines
+#plot for [i=3:25]  'nodes.dat' using 1:(sum [col=4:i+1] column(col)) with lines notitle
+plot for [i=26:26] 'nodes.dat' using 1:(sum [col=4:i+1] column(col)) with lines title 'jobs (max 384)'