[Swift-commit] r6609 - in branches/faster: . libexec/log-processing

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-08 00:40:59 -0500 (Mon, 08 Jul 2013)
New Revision: 6609

Modified:
   branches/faster/
   branches/faster/libexec/log-processing/log-to-execute-transitions
   branches/faster/libexec/log-processing/log-to-execute2-transitions
Log:
merged 6202 from trunk


Property changes on: branches/faster
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.93:4761-5122
/trunk:6172,6177,6182,6189-6190
   + /branches/release-0.93:4761-5122
/trunk:6172,6177,6182,6189-6190,6202

Modified: branches/faster/libexec/log-processing/log-to-execute-transitions
===================================================================
--- branches/faster/libexec/log-processing/log-to-execute-transitions	2013-07-08 05:37:39 UTC (rev 6608)
+++ branches/faster/libexec/log-processing/log-to-execute-transitions	2013-07-08 05:40:59 UTC (rev 6609)
@@ -11,15 +11,16 @@
 # then change relevant lines to transition format
 
 # then filter out unchanged lines because they're irrelevant
+grep ' INFO  swift ' | grep thread | grep -v provenanceid | \
+grep -v ARRAYRANGE | iso-to-secs | grep -E '^[^ ]+ +[^ ]+ +swift ' | \
+sed 's/\([^ ]*\) INFO  swift Exception in .*://' | \
+sed 's/\([^ ]*\) INFO  swift \([^ =]*\) \([^ =]*\) .*thread=\([^ ]*\).*$/\1 \4 \2.\3/' | \
+sed 's/\([^ ]*\) INFO  swift \([^ ]*\) .*thread=\([^ ]*\).*tr=\([^ ]*\).*$/\1 \3 \2 \4/' | \
+sed 's/\([^ ]*\) INFO  swift \([^ ]*\) .*thread=\([^ ]*\).*$/\1 \3 \2/' | \
+grep -E '^[^$]'
 
-grep ' vdl:execute ' | iso-to-secs | \
-grep -E '^[^ ]+ +[^ ]+ +vdl:execute ' | \
-sed 's/\([^ ]*\) INFO  vdl:execute Exception in .*://' | \
-sed 's/\([^ ]*\) INFO  vdl:execute \([^ =]*\) \([^ =]*\) .*thread=\([^ ]*\).*$/\1 \4 \2.\3/' |\
-sed 's/\([^ ]*\) INFO  vdl:execute \([^ ]*\) .*thread=\([^ ]*\).*tr=\([^ ]*\).*$/\1 \3 \2 \4/' |\
-sed 's/\([^ ]*\) INFO  vdl:execute \([^ ]*\) .*thread=\([^ ]*\).*$/\1 \3 \2/' |\
- grep -E '^[^$]'
 
+
 # force a successful exit, rather than using the exit codes from pipeline
 # components above (most probably grep?)
 

Modified: branches/faster/libexec/log-processing/log-to-execute2-transitions
===================================================================
--- branches/faster/libexec/log-processing/log-to-execute2-transitions	2013-07-08 05:37:39 UTC (rev 6608)
+++ branches/faster/libexec/log-processing/log-to-execute2-transitions	2013-07-08 05:40:59 UTC (rev 6609)
@@ -12,12 +12,19 @@
 
 # then filter out unchanged lines because they're irrelevant
 
-grep ' vdl:execute2 ' | iso-to-secs | \
-grep -E '^[^ ]+ +[^ ]+ +vdl:execute2 ' | \
-sed 's/^\(.*\) DEBUG vdl:execute2 THREAD_ASSOCIATION jobid=\([^ ]*\) thread=\([0-9\-]*\) host=\([^ ]*\) replicationGroup=\([^ ]*\).*$/\1 \2 ASSOCIATED \3 \4 \5/'  | \
+#grep ' vdl:execute2 ' | iso-to-secs | \
+#grep -E '^[^ ]+ +[^ ]+ +vdl:execute2 ' | \
+#sed 's/^\(.*\) DEBUG vdl:execute2 THREAD_ASSOCIATION jobid=\([^ ]*\) thread=\([0-9\-]*\) host=\([^ ]*\) replicationGroup=\([^ ]*\).*$/\1 \2 ASSOCIATED \3 \4 \5/'  | \
+#\
+#sed 's/^\([^ ]*\) DEBUG vdl:execute2 \([^ ]*\) jobid=\([^ ]*\).*/\1 \3 \2/'
+
+grep ' swift ' | iso-to-secs | \
+grep -E '^[^ ]+ +[^ ]+ +swift ' | \
+sed 's/^\(.*\) DEBUG swift THREAD_ASSOCIATION jobid=\([^ ]*\) thread=\([0-9\-]*\) host=\([^ ]*\) replicationGroup=\([^ ]*\).*$/\1 \2 ASSOCIATED \3 \4 \5/'  | \
 \
-sed 's/^\([^ ]*\) DEBUG vdl:execute2 \([^ ]*\) jobid=\([^ ]*\).*/\1 \3 \2/'
+sed 's/^\([^ ]*\) DEBUG swift \([^ ]*\) jobid=\([^ ]*\).*/\1 \3 \2/' | grep -v DEBUG | grep -v INFO
 
+
 # | \
 #sed 's/^\([^ ]*\) DEBUG vdl:execute2 \([^ ]*\) application exception: \(.*\)$/\1 \2 FAILED \3/' | \
 #sed 's/^\([^ ]*\) INFO  vdl:execute2 Completed job \([^ ]*\) \([^ ]*\) .* on [^ ]*$/\1 \2 EXECCOMPLETED/' | \