Skip to content

Commit

Permalink
Many changes to evaluator:
Browse files Browse the repository at this point in the history
- support for multiple data source definitions
- ability to tell a specific thread group to use a specific data source
- ability for multiple thread groups in one table group
- modifications to the data collection to allow for finer-grained sampling
- additional display that shows reads versus writes
etc.
  • Loading branch information
edward committed Feb 26, 2009
1 parent e70659b commit f9dac28
Show file tree
Hide file tree
Showing 25 changed files with 3,813 additions and 2,506 deletions.
36 changes: 19 additions & 17 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib-ext/postgres/postgresql-8.2-505.jdbc3.jar"/>
<classpathentry kind="lib" path="lib-ext/mysql/mysql-connector-java-3.1.14-bin.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="xml"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/log4j.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.6.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.10.jar"/>
<classpathentry kind="lib" path="lib-ext/hsqldb.jar"/>
<classpathentry kind="lib" path="config"/>
<classpathentry kind="output" path="eclipse-build"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.15.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.12.jar"/>
<classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib-ext/postgres/postgresql-8.2-505.jdbc3.jar"/>
<classpathentry kind="lib" path="lib-ext/mysql/mysql-connector-java-3.1.14-bin.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="xml"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/log4j.jar"/>
<classpathentry kind="lib" path="lib-ext/hsqldb.jar"/>
<classpathentry kind="lib" path="config"/>
<classpathentry combineaccessrules="false" kind="src" path="/sql-router"/>
<classpathentry kind="lib" path="C:/Users/Edward/Desktop/Veditam/Veditam Development/sql-router/build/jars/tungsten-sqlrouter.jar"/>
<classpathentry kind="output" path="eclipse-build"/>
</classpath>
553 changes: 283 additions & 270 deletions .settings/org.eclipse.jdt.core.prefs

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions .settings/org.eclipse.jdt.ui.prefs

Large diffs are not rendered by default.

21 changes: 14 additions & 7 deletions bin/evaluator.bat
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
rem Bristlecone-@VERSION@
rem
rem (UNDER CONSTRUCTION--DOES NOT WORK YET!)
rem Bristlecone-0.6
rem
rem
rem Bristlecone Cluster Test Tools
rem (c) 2006-2007 Continuent, Inc.. All rights reserved.

set BHOME=C:\Program Files\continuent\bristlecone
set CP=%BHOME%\lib\bristlecone.jar
set CP=%CP%;%BHOME%\lib\pcluster-8.0-314.jdbc3-driver.jar
set CP=%CP%;%BHOME%\lib\hsqldb.jar
set JAVA_OPTS=-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=4142,suspend=n
set BHOME=C:\Users\Edward\Desktop\bristlecone
set CP=.
set CP=%CP%;%BHOME%\lib-ext\hsqldb.jar
set CP=%CP%;%BHOME%\lib-ext\mysql-connector-java-5.0.8-bin.jar
set CP=%CP%;%BHOME%\lib\tungsten-commons.jar
set CP=%CP%;%BHOME%\lib-ext\tungsten-sqlrouter.jar
set CP=%CP%;%BHOME%\lib\log4j.jar
set CP=%CP%;%BHOME%\lib\bristlecone.jar
set CP=%CP%;%BHOME%\lib\jcommon-1.0.10.jar
set CP=%CP%;%BHOME%\lib\jfreechart-1.0.6.jar
set CP=%CP%;%BHOME%\config\evaluator
set CP=%CP%;%BHOME%\config
java -cp "%CP%" com.continuent.bristlecone.evaluator.Evaluator %1
java %JAVA_OPTS% -cp "%CP%" com.continuent.bristlecone.evaluator.Evaluator -graph %1
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
</target>

<!-- Create the distribution files -->
<target name="dist" depends="src,build,javadoc"
<target name="dist" depends="src,build"
description="Create distributable releases">

<!-- Build binary files. -->
Expand Down
21 changes: 21 additions & 0 deletions config/evaluator/mysqlEvaluator_sample.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE EvaluatorConfiguration SYSTEM "file://C:/Documents and Settings/rhannus/workspace/evaluator/evaluator.dtd">
<!--
This configuration runs a 2 minute test against the pcluster configuration.
It should create a load on the backend databases.
All the names enclosed in '@' must be changed to the actual names used
in your system.
-->
<EvaluatorConfiguration name="mysql" testDuration="120"
autoCommit="true" statusInterval="2" htmlFile="mysqlResults.html">
<Database driver="com.mysql.pcluster.driver.Driver"
url="jdbc:pcluster://@controller1@,@controller2@/@virtualdatabase@"
user="@virtualdatabase_login@"
password="@virtualdatabase_password@"/>

<TableGroup name="tbl" size="200">
<ThreadGroup name="A" threadCount="100" thinkTime="500"
updates="7" deletes="1" inserts="2" readSize="10"
rampUpInterval="10" rampUpIncrement="10"/>
</TableGroup>
</EvaluatorConfiguration>
Binary file removed lib/jcommon-1.0.10.jar
Binary file not shown.
Binary file added lib/jcommon-1.0.15.jar
Binary file not shown.
Binary file added lib/jfreechart-1.0.12.jar
Binary file not shown.
Binary file removed lib/jfreechart-1.0.6.jar
Binary file not shown.
100 changes: 100 additions & 0 deletions mysqlResults.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<HTML>
<HEAD>
<TITLE>mysql </TITLE>
</HEAD>
<BODY>
<TABLE border="1">
<TR>
<TH>time </TH>
<TH>users </TH>
<TH>average response time </TH>
<TH>queries Per Second </TH>
<TH>label </TH>
<TH>queries </TH>
<TH>rows read </TH>
<TH>updates </TH>
<TH>deletes </TH>
<TH>inserts </TH>
<TH>interval </TH>
</TR>
<TR>
<TD align="right">1 </TD>
<TD align="right">4 </TD>
<TD align="right">0 </TD>
<TD align="right">0 </TD>
<TD>Feb 26, 2009 7:06:17 AM </TD>
<TD align="right">0 </TD>
<TD align="right">0 </TD>
<TD align="right">2 </TD>
<TD align="right">2 </TD>
<TD align="right">2 </TD>
<TD align="right">1 </TD>
</TR>
<TR>
<TD align="right">2 </TD>
<TD align="right">10 </TD>
<TD align="right">24 </TD>
<TD align="right">364 </TD>
<TD>Feb 26, 2009 7:06:19 AM </TD>
<TD align="right">364 </TD>
<TD align="right">35789 </TD>
<TD align="right">30 </TD>
<TD align="right">32 </TD>
<TD align="right">28 </TD>
<TD align="right">1 </TD>
</TR>
<TR>
<TD align="right">3 </TD>
<TD align="right">11 </TD>
<TD align="right">25 </TD>
<TD align="right">358 </TD>
<TD>Feb 26, 2009 7:06:21 AM </TD>
<TD align="right">358 </TD>
<TD align="right">35254 </TD>
<TD align="right">27 </TD>
<TD align="right">38 </TD>
<TD align="right">33 </TD>
<TD align="right">1 </TD>
</TR>
<TR>
<TD align="right">4 </TD>
<TD align="right">20 </TD>
<TD align="right">25 </TD>
<TD align="right">356 </TD>
<TD>Feb 26, 2009 7:06:23 AM </TD>
<TD align="right">356 </TD>
<TD align="right">36261 </TD>
<TD align="right">22 </TD>
<TD align="right">30 </TD>
<TD align="right">23 </TD>
<TD align="right">1 </TD>
</TR>
<TR>
<TD align="right">5 </TD>
<TD align="right">20 </TD>
<TD align="right">27 </TD>
<TD align="right">336 </TD>
<TD>Feb 26, 2009 7:06:25 AM </TD>
<TD align="right">336 </TD>
<TD align="right">33083 </TD>
<TD align="right">38 </TD>
<TD align="right">32 </TD>
<TD align="right">27 </TD>
<TD align="right">1 </TD>
</TR>
<TR>
<TD align="right">5 </TD>
<TD align="right">20 </TD>
<TD align="right">25 </TD>
<TD align="right">2147483647 </TD>
<TD>Total </TD>
<TD align="right">3582 </TD>
<TD align="right">360493 </TD>
<TD align="right">320 </TD>
<TD align="right">320 </TD>
<TD align="right">323 </TD>
<TD align="right">0 </TD>
</TR>
</TABLE>
</BODY>
</HTML>
Loading

0 comments on commit f9dac28

Please sign in to comment.