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

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

Revision: 1415
          http://assorted.svn.sourceforge.net/assorted/?rev=1415&view=rev
Author:   yangzhang
Date:     2009-05-13 19:20:47 +0000 (Wed, 13 May 2009)

Log Message:
-----------
added aries to scalability experiments

Modified Paths:
--------------
    ydb/trunk/tools/analysis.py
    ydb/trunk/tools/test.bash

Modified: ydb/trunk/tools/analysis.py
===================================================================
--- ydb/trunk/tools/analysis.py	2009-05-13 19:20:34 UTC (rev 1414)
+++ ydb/trunk/tools/analysis.py	2009-05-13 19:20:47 UTC (rev 1415)
@@ -105,8 +105,8 @@
   print
   return res
 
-def scaling(npath, dpath, title):
-  for label, p in [('network recovery', npath), ('disk checkpointing', dpath)]:
+def scaling(npath, dpath, apath, title):
+  for label, p in [('network recovery', npath), ('disk checkpointing', dpath), ('ARIES WAL', apath)]:
     print '===', title, '==='
     print 'file:', getname(p)
     res = logextract(p, 'config', [
@@ -123,14 +123,14 @@
   ylabel('Mean TPS (stdev error bars)')
   legend(loc = 'lower left', prop = FontProperties(size = 'small'))
 
-def scaledata(npath, dpath):
-  scaling(npath, dpath, 'scaledata')
+def scaledata(npath, dpath, apath):
+  scaling(npath, dpath, apath, 'scaledata')
   title('Scaling of throughput with number of warehouses')
   xlabel('Number of warehouses')
   savefig('scaledata.png')
 
-def scalenodes(npath, dpath):
-  scaling(npath, dpath, 'scalenodes')
+def scalenodes(npath, dpath, apath):
+  scaling(npath, dpath, apath, 'scalenodes')
   title('Scaling of throughput with number of nodes')
   xlabel('Node count')
   savefig('scalenodes.png')
@@ -348,9 +348,9 @@
   if len(argv) <= 1:
     print >> sys.stderr, 'Must specify a command'
   elif argv[1] == 'scaledata':
-    scaledata(*argv[2:] if len(argv) > 2 else ['nscaledata-log', 'dscaledata-log'])
+    scaledata(*argv[2:] if len(argv) > 2 else ['nscaledata-log', 'dscaledata-log', 'ascaledata-log'])
   elif argv[1] == 'scalenodes':
-    scalenodes(*argv[2:] if len(argv) > 2 else ['nscalenodes-log', 'dscalenodes-log'])
+    scalenodes(*argv[2:] if len(argv) > 2 else ['nscalenodes-log', 'dscalenodes-log', 'ascalenodes-log'])
   elif argv[1] == 'rectps':
     rectps_warehouses(*argv[2:] if len(argv) > 2 else ['nrec-warehouses', 'drec-warehouses'])
   elif argv[1] == 'rectime-warehouses':

Modified: ydb/trunk/tools/test.bash
===================================================================
--- ydb/trunk/tools/test.bash	2009-05-13 19:20:34 UTC (rev 1414)
+++ ydb/trunk/tools/test.bash	2009-05-13 19:20:47 UTC (rev 1415)
@@ -567,7 +567,7 @@
 }
 
 # ydb scalability test.
-scaling-helper() {
+scalenodes-helper() {
   local leader=$1
   : ${stopseqno:=300000}
   shift
@@ -578,10 +578,11 @@
   done
   wait
 }
-scaling() { hostargs scaling-helper ; }
-exp-nscaling() { name=nscaling exp-var scaling stop ; }
-exp-dscaling() { name=dscaling extraargs=--disk exp-var scaling stop ; }
-exp-scaling() { exp-nscaling ; exp-dscaling ; }
+scalenodes() { hostargs scalenodes-helper ; }
+exp-nscalenodes() { name=nscalenodes exp-var scalenodes stop ; }
+exp-dscalenodes() { name=dscalenodes extraargs=--disk exp-var scalenodes stop ; }
+exp-ascalenodes() { name=ascalenodes extraargs=--wal exp-var scalenodes stop ; }
+exp-scalenodes() { exp-nscalenodes ; exp-dscalenodes ; exp-ascalenodes ; }
 
 #
 # For scaling the size of the database.
@@ -622,6 +623,7 @@
 scaledata() { hostargs scaledata-helper ; }
 exp-nscaledata() { exp-var-param nscaledata scaledata warehouses stop 5 4 3 2 1 ; }
 exp-dscaledata() { extraargs=--disk exp-var-param dscaledata scaledata warehouses stop 5 4 3 2 1 ; }
+exp-ascaledata() { extraargs=--wal exp-var-param ascaledata scaledata warehouses stop 5 4 3 2 1 ; }
 exp-scaledata() { exp-nscaledata ; exp-dscaledata ; }
 
 mtcp-helper() {
@@ -713,25 +715,6 @@
 exp-epperf() { exp-var epperf ; }
 
 #
-# WAL experiments.
-#
-
-aries() {
-  extraargs='--wal' scaling ${hosts:-}
-}
-
-exp-aries() {
-  local out=aries-log-$(date +%Y-%m-%d-%H:%M:%S)
-  ln -sf $out aries-log
-  for i in {1..3} ; do
-    echo === n=-1 i=$i ===
-    echo === n=-1 i=$i === > `tty`
-    aries
-    echo
-  done >& $out
-}
-
-#
 # Prototype 2
 #
 


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