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 ak...@apache.org on 2009/01/26 22:52:30 UTC
svn commit: r737914 -
/incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java
Author: akara
Date: Mon Jan 26 22:52:30 2009
New Revision: 737914
URL: http://svn.apache.org/viewvc?rev=737914&view=rev
Log:
Fix for issue OLIO-39: Added support for master/slave databases in harness hook.
Modified:
incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java
Modified: incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java?rev=737914&r1=737913&r2=737914&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java (original)
+++ incubator/olio/workload/php/trunk/src/com/sun/web20/harness/Web20Benchmark.java Mon Jan 26 22:52:30 2009
@@ -61,7 +61,8 @@
phpIniPath = params.getParameter("webServer/phpIniPath");
cacheBinPath = params.getParameter("cacheServers/cacheBinPath");
dbConfPath = params.getParameter("dbServer/dbConfPath");
- String dbhost = params.getParameter("dbServer/fa:hostConfig/fa:host");
+ String[] dbhosts = params.getParameter(
+ "dbServer/fa:hostConfig/fa:host").split(" ");
String[] webhosts = params.getParameter(
"webServer/fa:hostConfig/fa:host").split(" ");
@@ -96,8 +97,10 @@
getHostName(webhost));
}
- RunContext.getFile(dbhost, dbConfPath + "/my.cnf",
- RunContext.getOutDir() + "my_cnf.log." + getHostName(dbhost));
+ for (String dbhost : dbhosts) {
+ RunContext.getFile(dbhost, dbConfPath + "/my.cnf",
+ RunContext.getOutDir() + "my_cnf.log." + getHostName(dbhost));
+ }
// Reloading database and media as necessary.
boolean reloadDB = Boolean.parseBoolean(
@@ -113,8 +116,7 @@
CommandHandle mediaHandle = null;
if (reloadDB) {
logger.info("Reloading the database for " + scale + " users!");
- String dbHost =
- params.getParameter("dbServer/fa:hostConfig/fa:host");
+ String dbhost = dbhosts[0];
String driver = params.getParameter("dbServer/dbDriver");
String connectURL = params.getParameter("dbServer/connectURL");
// Un-escape the URL.
@@ -131,7 +133,7 @@
cmdList.add(String.valueOf(scale));
Command c = new Command(cmdList);
c.setSynchronous(false);
- dbHandle = java(dbHost, c);
+ dbHandle = java(dbhost, c);
}
if (reloadMedia) {