[Swift-commit] r6204 - provenancedb

[lgadelha at ci.uchicago.edu]

Author: lgadelha
Date: 2013-01-31 07:51:49 -0600 (Thu, 31 Jan 2013)
New Revision: 6204

Modified:
   provenancedb/README.asciidoc
   provenancedb/prov-init.sql
   provenancedb/prov-to-sql.sh
Log:


Modified: provenancedb/README.asciidoc
===================================================================
--- provenancedb/README.asciidoc	2013-01-31 13:51:13 UTC (rev 6203)
+++ provenancedb/README.asciidoc	2013-01-31 13:51:49 UTC (rev 6204)
@@ -164,10 +164,11 @@
 
 === Swift Configuration
 
-To enable the generation of provenance information in Swift's log files the option +provenance.log+ should be set to true in +etc/swift.properties+:
+To enable the generation of provenance information in Swift's log files and to trasfer wrapper logs back to the submitting machine for runtimei behavior information extraction the options +provenance.log+ and wrapperlog.always.transfer=true should be set to true in +etc/swift.properties+:
 
 --------------------------------------
 provenance.log=true
+wrapperlog.always.transfer=true
 --------------------------------------
 
 If Swift's SVN revision is 3417 or greater, the following options should be set in +etc/log4j.properties+:

Modified: provenancedb/prov-init.sql
===================================================================
--- provenancedb/prov-init.sql	2013-01-31 13:51:13 UTC (rev 6203)
+++ provenancedb/prov-init.sql	2013-01-31 13:51:49 UTC (rev 6204)
@@ -161,6 +161,12 @@
   select id, app_fun_call_id as function_call_id, to_timestamp(start_time) as start_time, duration, final_state, site
   from   app_exec;
 
+create view application_runtime_info as
+  select id, real_secs as real, kernel_secs as kernel, user_secs as user, percent_cpu as cpu, max_rss as maxrss, 
+         avg_rss as avgrss, avg_tot_vm as avgtotvm, avg_priv_data as avgprdata, avg_priv_stack as avgprvstck, 
+         avg_shared_text as avgshtxt, page_size, major_pgfaults as majpf, minor_pgfaults as minpf, swaps, 
+         invol_context_switches as invcs, vol_waits as volwait, fs_reads as fsread, fs_writes as fswrite, 
+         sock_recv as sockrcv, sock_send as socksnd, signals, exit_status as exit_st from app_exec;
 
 -- app execution runtime info extracted from the /proc filesystem (assumes the app executed
 -- in a Linux host) 

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2013-01-31 13:51:13 UTC (rev 6203)
+++ provenancedb/prov-to-sql.sh	2013-01-31 13:51:49 UTC (rev 6204)
@@ -131,28 +131,28 @@
     while read execute2_id runtime; do
 	real_secs=$(echo $runtime | awk -F "," '{print $1}' | awk -F ":" '{print $2}')
 	kernel_secs=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	user_secs=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	percent_cpu=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	max_rss=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	avg_rss=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	avg_tot_vm=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	avg_priv_data=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	avg_priv_stack=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	avg_shared_text=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	page_size=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	major_pgfaults=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	minor_pgfaults=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	swaps=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
+	user_secs=$(echo $runtime | awk -F "," '{print $3}' | awk -F ":" '{print $2}')
+	percent_cpu=$(echo $runtime | awk -F "," '{print $3}' | awk -F ":" '{print $2}')
+	max_rss=$(echo $runtime | awk -F "," '{print $3}' | awk -F ":" '{print $2}')
+	avg_rss=$(echo $runtime | awk -F "," '{print $6}' | awk -F ":" '{print $2}')
+	avg_tot_vm=$(echo $runtime | awk -F "," '{print $7}' | awk -F ":" '{print $2}')
+	avg_priv_data=$(echo $runtime | awk -F "," '{print $8}' | awk -F ":" '{print $2}')
+	avg_priv_stack=$(echo $runtime | awk -F "," '{print $9}' | awk -F ":" '{print $2}')
+	avg_shared_text=$(echo $runtime | awk -F "," '{print $10}' | awk -F ":" '{print $2}')
+	page_size=$(echo $runtime | awk -F "," '{print $11}' | awk -F ":" '{print $2}')
+	major_pgfaults=$(echo $runtime | awk -F "," '{print $12}' | awk -F ":" '{print $2}')
+	minor_pgfaults=$(echo $runtime | awk -F "," '{print $13}' | awk -F ":" '{print $2}')
+	swaps=$(echo $runtime | awk -F "," '{print $14}' | awk -F ":" '{print $2}')
 	invol_context_switches=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	vol_waits=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	fs_reads=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	fs_writes=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	sock_recv=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	sock_send=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	signals=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
-	exit_status=$(echo $runtime | awk -F "," '{print $2}' | awk -F ":" '{print $2}')
+	vol_waits=$(echo $runtime | awk -F "," '{print $15}' | awk -F ":" '{print $2}')
+	fs_reads=$(echo $runtime | awk -F "," '{print $16}' | awk -F ":" '{print $2}')
+	fs_writes=$(echo $runtime | awk -F "," '{print $17}' | awk -F ":" '{print $2}')
+	sock_recv=$(echo $runtime | awk -F "," '{print $18}' | awk -F ":" '{print $2}')
+	sock_send=$(echo $runtime | awk -F "," '{print $19}' | awk -F ":" '{print $2}')
+	signals=$(echo $runtime | awk -F "," '{print $20}' | awk -F ":" '{print $2}')
+	exit_status=$(echo $runtime | awk -F "," '{print $21}' | awk -F ":" '{print $2}')
 	
-	echo "UPDATE app_exec SET real_secs='$real_secs', kernel_secs='$kernel_secs', user_secs='$user_secs', percent_cpu='$percent_cpu', max_rss='$max_rss', avg_rss='$avg_rss', avg_tot_vm='$avg_tot_vm', avg_priv_data='$avg_priv_data', avg_priv_stack='$avg_priv_stack', avg_priv_stack='$avg_priv_stack', avg_shared_text='$avg_shared_text', page_size='$page_size', major_pgfaults='$major_pgfaults', minor_pgfaults='$minor_pgfaults', swaps='$swaps', invol_context_switches='$invol_context_switches', vol_waits='$vol_waits', fs_reads='$fs_reads', fs_writes='$fs_writes', sock_recv='$sock_recv', sock_send='$sock_send', signals='$signals', exit_status='$exit_status' WHERE app_exec_id='$execute2_id';"
+	echo "UPDATE app_exec SET real_secs='$real_secs', kernel_secs='$kernel_secs', user_secs='$user_secs', percent_cpu='$percent_cpu', max_rss='$max_rss', avg_rss='$avg_rss', avg_tot_vm='$avg_tot_vm', avg_priv_data='$avg_priv_data', avg_priv_stack='$avg_priv_stack', avg_shared_text='$avg_shared_text', page_size='$page_size', major_pgfaults='$major_pgfaults', minor_pgfaults='$minor_pgfaults', swaps='$swaps', invol_context_switches='$invol_context_switches', vol_waits='$vol_waits', fs_reads='$fs_reads', fs_writes='$fs_writes', sock_recv='$sock_recv', sock_send='$sock_send', signals='$signals', exit_status='$exit_status' WHERE id='$execute2_id';" >> /tmp/$RUNID.sql
 	#echo "INSERT INTO rt_info (app_exec_id, timestamp, cpu_usage, max_phys_mem, max_virt_mem, io_read, io_write) VALUES ('$execute2_id', $timestamp, $cpu_usage, $max_phys_mem, $max_virtual_mem, $io_read_bytes, $io_write_bytes);"  >> /tmp/$RUNID.sql
 
 #	for key in $(echo maxrss walltime systime usertime cpu fsin fsout timesswapped socketrecv socketsent majorpagefaults minorpagefaults contextswitchesinv contextswitchesvol); do