[Assorted-commits] SF.net SVN: assorted:[1307] ydb/trunk

[<yan...@us...>]

Revision: 1307
          http://assorted.svn.sourceforge.net/assorted/?rev=1307&view=rev
Author:   yangzhang
Date:     2009-03-18 20:08:05 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
- main: fixed starting of extraneous recover_joiner's
- test.bash: added whos, updated line-counts
- removed wc.bash

Modified Paths:
--------------
    ydb/trunk/README
    ydb/trunk/src/main.lzz.clamp
    ydb/trunk/tools/test.bash

Removed Paths:
-------------
    ydb/trunk/tools/wc.bash

Modified: ydb/trunk/README
===================================================================
--- ydb/trunk/README	2009-03-18 19:25:42 UTC (rev 1306)
+++ ydb/trunk/README	2009-03-18 20:08:05 UTC (rev 1307)
@@ -749,8 +749,8 @@
 - DONE full TPC-C txn workload
   - readonly: order_status, stock_level
   - overwhelming majority are payment/neworder
+- DONE prelim measurements on cluster
 - TODO skip processing readonly txns on catch-up
-- TODO prelim measurements on cluster
 
 - TODO PAPER!!!
 

Modified: ydb/trunk/src/main.lzz.clamp
===================================================================
--- ydb/trunk/src/main.lzz.clamp	2009-03-18 19:25:42 UTC (rev 1306)
+++ ydb/trunk/src/main.lzz.clamp	2009-03-18 20:08:05 UTC (rev 1307)
@@ -2137,9 +2137,10 @@
          ref(send_states), ref(backlog), init.txnseqno(), mypos,
          init.node_size());
   st_joining join_proc(my_spawn(process_fn, "process_txns"));
-  st_joining join_rec(my_spawn(bind(recover_joiner, listener,
-                                    ref(send_states)),
-                               "recover_joiner"));
+  if (init.txnseqno() == 0 && multirecover || mypos == 0)
+    st_joining join_rec(my_spawn(bind(recover_joiner, listener,
+                                      ref(send_states)),
+                                 "recover_joiner"));
 
   try {
     // If there's anything to recover.

Modified: ydb/trunk/tools/test.bash
===================================================================
--- ydb/trunk/tools/test.bash	2009-03-18 19:25:42 UTC (rev 1306)
+++ ydb/trunk/tools/test.bash	2009-03-18 20:08:05 UTC (rev 1307)
@@ -315,6 +315,15 @@
   "
 }
 
+whos() {
+  xargs= parssh "
+    echo
+    hostname
+    echo =====
+    w
+  "
+}
+
 times() {
   parssh date +%s.%N
 }
@@ -350,7 +359,7 @@
 
 # Recovery experient.
 exp-rec() {
-  for seqno in 500000 400000 300000 200000 100000 ; do # configurations
+  for seqno in 300000 200000 100000 ; do # configurations
     stop
     for i in {1..3} ; do # trials
       echo === seqno=$seqno i=$i ===
@@ -429,7 +438,7 @@
   tagssh $leader "CPUPROFILE=ydb.prof ydb/src/ydb -q -l -n $# -X 100000 --tpcc ${extraargs:-}" &
   sleep .1
   for rep in "$@"
-  do tagssh $rep "CPUPROFILE=ydb.prof --args ydb/src/ydb -q -n $# -H $leader --tpcc ${extraargs:-}" &
+  do tagssh $rep "CPUPROFILE=ydb.prof ydb/src/ydb -q -n $# -H $leader --tpcc ${extraargs:-}" &
   done
   wait
 }
@@ -566,7 +575,7 @@
 }
 
 line-counts() {
-  wc -l "$(dirname "$0")/../src/"{main.lzz.clamp,ser.{h,cc},p2.cc,ydb.proto,Makefile,serperf.cc} \
+  wc -l "$(dirname "$0")/../src/"{main.lzz.clamp,ser.{h,cc},p2.cc,ydb.proto,Makefile,serperf.cc,tpcc/{Makefile,*.{h,cc,cog}}} \
         ~/ccom/src/{commons/{,st/}*.h,test/{*.*,Makefile}}
 }
 

Deleted: ydb/trunk/tools/wc.bash
===================================================================
--- ydb/trunk/tools/wc.bash	2009-03-18 19:25:42 UTC (rev 1306)
+++ ydb/trunk/tools/wc.bash	2009-03-18 20:08:05 UTC (rev 1307)
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$(dirname "$0")/../src/"
-wc -l main.lzz.clamp
-{
-  wc -l main.lzz.clamp
-
-  cat main.lzz.clamp |
-  perl -n -e 'if (m /#include <commons/s) { s/.*<(.+)>.*/$1/; print }' |
-  xargs -I_ wc -l /home/yang/ccom/src/_
-} | cut -f1 -d' ' | numsum | xargs -I_ echo _ total


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.