You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by sh...@apache.org on 2009/10/21 21:22:48 UTC
svn commit: r828221 - in /incubator/olio/workload/java/trunk/deploy:
config.xhtml run.xml
Author: shanti
Date: Wed Oct 21 21:22:46 2009
New Revision: 828221
URL: http://svn.apache.org/viewvc?rev=828221&view=rev
Log:
OLIO-113. Final fixes to align with latest faban services.
Modified:
incubator/olio/workload/java/trunk/deploy/config.xhtml
incubator/olio/workload/java/trunk/deploy/run.xml
Modified: incubator/olio/workload/java/trunk/deploy/config.xhtml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/java/trunk/deploy/config.xhtml?rev=828221&r1=828220&r2=828221&view=diff
==============================================================================
--- incubator/olio/workload/java/trunk/deploy/config.xhtml (original)
+++ incubator/olio/workload/java/trunk/deploy/config.xhtml Wed Oct 21 21:22:46 2009
@@ -57,7 +57,7 @@
<xforms:bind id='bind-webServer-service-config' xforms:nodeset='fh:config' >
<xforms:bind id='bind-webServer-cmdPath' xforms:nodeset='cmdPath'/>
<xforms:bind id='bind-webServer-logsDir' xforms:nodeset='logsDir'/>
- <xforms:bind id='bind-webServer-configDir' xforms:nodeset='configDir'/>
+ <xforms:bind id='bind-webServer-confPath' xforms:nodeset='confPath'/>
</xforms:bind>
</xforms:bind>
</xforms:bind>
@@ -73,6 +73,7 @@
<xforms:bind id="bind-reloadDB" xforms:nodeset="reloadDB" xforms:type="boolean"/>
<xforms:bind id="bind-load-scale" xforms:nodeset="scale" xforms:type="positiveInteger"/>
<xforms:bind id='bind-dbServer-service' xforms:nodeset='fh:service'>
+ <xforms:bind id="bind-dbServer-service-tools" xforms:nodeset='fh:tools' />
<xforms:bind id='bind-dbServer-service-config' xforms:nodeset='fh:config'>
<xforms:bind id='bind-db-serverHome' xforms:nodeset='serverHome'/>
<xforms:bind id="bind-db-confPath" xforms:nodeset="confPath" />
@@ -97,6 +98,7 @@
<xforms:bind id="bind-cacheServers-userCommands" xforms:nodeset="fh:userCommands"/>
</xforms:bind>
<xforms:bind id='bind-cacheServers-service' xforms:nodeset='fh:service' >
+ <xforms:bind id="bind-cacheServers-service-tools" xforms:nodeset='fh:tools' />
<xforms:bind id='bind-cacheServers-service-config' xforms:nodeset='fh:config' >
<xforms:bind id="bind-cache-cmdPath" xforms:nodeset="cmdPath"/>
<xforms:bind id='bind-cache-serverMemSize' xforms:nodeset='serverMemSize' xforms:type="positiveInteger"/>
@@ -129,7 +131,7 @@
<delay>Time between starts (ms)</delay>
<simultaneous>Start simultaneously</simultaneous>
<parallel>Start agents in parallel</parallel>
- <webServer>Web Server</webServer>
+ <webServer>App Server</webServer>
<dbServer>Database Server</dbServer>
<dataStorage>Data Storage Server</dataStorage>
<cacheServers>Memcached Servers</cacheServers>
@@ -138,14 +140,15 @@
<dbDriver>JDBC driver class name</dbDriver>
<connectURL>JDBC connection URL</connectURL>
<reloadDB>Reload Database</reloadDB>
+ <dbTools>DB-specific Tools</dbTools>
<reloadMedia>Reload Images</reloadMedia>
<dbHomePath>Path for Database Home</dbHomePath>
<webserverType>Application Server</webserverType>
- <webserverBinPath>Webserver bin Directory</webserverBinPath>
- <webserverLogPath>Webserver logs Directory</webserverLogPath>
- <serverConfPath>Server Config Direcotry</serverConfPath>
+ <webserverBinPath>Appserver Command Path</webserverBinPath>
+ <webserverLogPath>Appserver Logs Directory</webserverLogPath>
+ <serverConfPath>Server Config File</serverConfPath>
<mediaDir>Media Directory</mediaDir>
- <dbConfPath>DB config file</dbConfPath>
+ <dbConfPath>DB Config File</dbConfPath>
<agents>Agents</agents>
<statsInterval>Stats Collection Interval</statsInterval>
<serverConfig>Server Information</serverConfig>
@@ -157,11 +160,8 @@
<cacheHostPorts>Memcached Hosts:Ports</cacheHostPorts>
<cacheCmdPath>Path to Memcached command</cacheCmdPath>
<serverMemSize>Server Memory Size</serverMemSize>
+ <cacheTools>Memcached Tools</cacheTools>
<pathConfig>URL Path Configurations</pathConfig>
- <java>Java</java>
- <php>PHP</php>
- <apache>Apache</apache>
- <lighttpd>lighttpd</lighttpd>
<glassfish>GlassFish</glassfish>
<tools>Tools</tools>
<userCommands>User Commands</userCommands>
@@ -333,28 +333,30 @@
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/glassfish"/>
<xforms:value>glassfish</xforms:value>
</xforms:item>
+ <!--
<xforms:item>
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/weblogic"/>
<xforms:value>weblogic</xforms:value>
</xforms:item>
+ -->
<xforms:hint>Choose the application server</xforms:hint>
<xforms:help>Choose the application server</xforms:help>
</xforms:choices>
</xforms:select1>
<xforms:input id="input-webServer-cmdPath" xforms:bind="bind-webServer-cmdPath">
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/webserverBinPath"/>
- <xforms:hint>Enter the path to the webserver bin directory</xforms:hint>
- <xforms:help>Enter the path to the webserver bin directory</xforms:help>
+ <xforms:hint>Enter the path to the appserver command</xforms:hint>
+ <xforms:help>Enter the path to the appserver command (used to start/stop the server)</xforms:help>
</xforms:input>
<xforms:input id="input-webServer-logPath" xforms:bind="bind-webServer-logsDir">
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/webserverLogPath"/>
- <xforms:hint>Enter the path to the webserver logs directory</xforms:hint>
- <xforms:help>Enter the path to the webserver logs directory</xforms:help>
+ <xforms:hint>Enter the path to the appserver logs directory</xforms:hint>
+ <xforms:help>Enter the path to the appserver logs directory</xforms:help>
</xforms:input>
- <xforms:input id="input-webServer-configDir" xforms:bind="bind-webServer-configDir">
+ <xforms:input id="input-webServer-confPath" xforms:bind="bind-webServer-confPath">
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/serverConfPath"/>
- <xforms:hint>Enter the app server config directory</xforms:hint>
- <xforms:help>Enter the app server config directory</xforms:help>
+ <xforms:hint>Enter the path to the app server config file</xforms:hint>
+ <xforms:help>Enter the path to the app server config file</xforms:help>
</xforms:input>
<xforms:select1 id="select1-restart" xforms:bind="bind-webServer-restart">
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/restart"/>
@@ -431,6 +433,11 @@
<xforms:hint>Enter the path to the DB config file </xforms:hint>
<xforms:help>Enter the path to the DB config file</xforms:help>
</xforms:input>
+ <xforms:input id="input-db-tools" xforms:bind="bind-dbServer-service-tools">
+ <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/dbTools"/>
+ <xforms:hint>Enter the DB-specific tools to run</xforms:hint>
+ <xforms:help>Enter the DB-specific tools to run</xforms:help>
+ </xforms:input>
</xforms:group>
<xforms:group id="group-dataStorage">
<xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/dataStorage"/>
@@ -497,22 +504,12 @@
<xforms:hint>Enter max. size of memcached cache (in MB)</xforms:hint>
<xforms:help>Enter max. size of memcached cache (in MB)</xforms:help>
</xforms:input>
- </xforms:group>
- <!-- Shanti - commenting for now, as not used
- <xforms:group id="group-otherServers">
- <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/otherServers"/>
- <xforms:input id="input-otherServers-host" xforms:bind="bind-otherServers-host">
- <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/hosts"/>
- <xforms:hint>The servers' host names or IP addresses, space separated</xforms:hint>
- <xforms:help>Enter the servers' host names or IP addresses, space separated</xforms:help>
- </xforms:input>
- <xforms:input id="input-otherServers-tools" xforms:bind="bind-otherServers-tools">
- <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/tools"/>
- <xforms:hint>Enter tool commands to collect statistics, separated by semi-colon</xforms:hint>
- <xforms:help>Enter tool commands to collect statistics, separated by semi-colon</xforms:help>
+ <xforms:input id="input-cacheServers-service-tools" xforms:bind="bind-cacheServers-service-tools">
+ <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/cacheTools"/>
+ <xforms:hint>Enter the memcached-specific tools to run</xforms:hint>
+ <xforms:help>Enter the memcached-specific tools to run</xforms:help>
</xforms:input>
</xforms:group>
- -->
</xforms:case>
</xforms:switch>
</xforms:group>
Modified: incubator/olio/workload/java/trunk/deploy/run.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/java/trunk/deploy/run.xml?rev=828221&r1=828220&r2=828221&view=diff
==============================================================================
--- incubator/olio/workload/java/trunk/deploy/run.xml (original)
+++ incubator/olio/workload/java/trunk/deploy/run.xml Wed Oct 21 21:22:46 2009
@@ -19,7 +19,7 @@
<fa:scale>50</fa:scale>
<fa:runControl>
- <fa:rampUp>10</fa:rampUp>
+ <fa:rampUp>30</fa:rampUp>
<fa:steadyState>300</fa:steadyState>
<fa:rampDown>10</fa:rampDown>
</fa:runControl>
@@ -35,14 +35,13 @@
<stats>
<maxRunTime>6</maxRunTime>
- <interval>10</interval>
+ <interval>30</interval>
</stats>
<runtimeStats enabled="false">
<interval>5</interval>
</runtimeStats>
-
-
+
<driverConfig name="UIDriver">
<agents>1</agents>
<stats>
@@ -57,7 +56,7 @@
<webServer>
<fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
- <fa:hostPorts>myHost:8080</fa:hostPorts>
+ <fa:hostPorts>webHost:8080</fa:hostPorts>
<enabled>true</enabled>
<cpus>0</cpus>
<tools>vmstat 10; mpstat 10; nicstat 10</tools>
@@ -69,9 +68,9 @@
<fh:tools>NONE</fh:tools>
<fh:restart>true</fh:restart>
<fh:config>
- <cmdPath>/opt/glassfish/bin</cmdPath>
+ <cmdPath>/opt/glassfish/bin/asadmin</cmdPath>
<logsDir>/opt/glassfish/domains/domain1/logs</logsDir>
- <configDir>/opt/glassfish/domains/domain1/config</configDir>
+ <confPath>/opt/glassfish/domains/domain1/config/domain.xml</confPath>
</fh:config>
</fh:service>
</webServer>
@@ -93,7 +92,7 @@
<fh:tools>Mysqlstats</fh:tools>
<fh:restart>false</fh:restart>
<fh:config>
- <serverHome>/export/home/mysql</serverHome>
+ <serverHome>/var/mysql</serverHome>
<user>olio</user>
<password>olio</password>
<confPath>/etc/my.cnf</confPath>
@@ -103,7 +102,7 @@
<dataStorage>
<fa:hostConfig xmlns:fa="http://faban.sunsource.net/ns/faban"
xmlns="http://faban.sunsource.net/ns/fabanharness">
- <fa:host>myDataStorageHost</fa:host>
+ <fa:host>storageHost</fa:host>
<enabled>true</enabled>
<cpus>0</cpus>
<tools>NONE</tools>