Author: wsobel
Date: Tue Feb 24 06:13:15 2009
New Revision: 747285
URL: http://svn.apache.org/viewvc?rev=747285&view=rev
Log:
OLIO-13: Fixed remaining issues regarding UIDriver and directory renaming.
Modified:
incubator/olio/workload/rails/trunk/deploy/run.xml
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
Modified: incubator/olio/workload/rails/trunk/deploy/run.xml
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/deploy/run.xml?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
--- incubator/olio/workload/rails/trunk/deploy/run.xml (original)
+++ incubator/olio/workload/rails/trunk/deploy/run.xml Tue Feb 24 06:13:15 2009
@@ -22,6 +22,8 @@
<fa:rampUp>10</fa:rampUp>
<fa:steadyState>600</fa:steadyState>
<fa:rampDown>10</fa:rampDown>
+ <fa:variableLoad>false</fa:variableLoad>
+ <fa:variableLoadFile>/faban/load.txt</fa:variableLoadFile>
</fa:runControl>
<outputDir>/tmp</outputDir>
@@ -48,6 +50,7 @@
<interval>30</interval>
</stats>
<runtimeStats target="9988"/>
+
<properties>
<property name="serverType">php</property>
<property
name="resourcePath">/apps/faban/benchmarks/olio/resources/</property>
Modified:
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
---
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
(original)
+++
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/driver/UIDriver.java
Tue Feb 24 06:13:15 2009
@@ -319,11 +319,11 @@
driverMetrics = new UIDriverMetrics();
ctx.attachMetrics(driverMetrics);
String hostPorts = ctx.getXPathValue(
- "/olio/webServer/fa:hostConfig/fa:hostPorts");
+ "//webServer/fa:hostConfig/fa:hostPorts");
List<NameValuePair<Integer>> hostPortList =
Utilities.parseHostPorts(hostPorts);
int loadedScale = Integer.parseInt(
- ctx.getXPathValue("/olio/dbServer/scale"));
+ ctx.getXPathValue("//dbServer/scale"));
loadedUsers = 4 * loadedScale;
if (scale > loadedScale)
throw new FatalException("Data loaded only for " + loadedScale +
Modified:
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
---
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
(original)
+++
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/fsloader/FileLoader.java
Tue Feb 24 06:13:15 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*
*/
-package com.sun.web20.fsloader;
+package org.apache.olio.workload.fsloader;
import org.apache.olio.workload.util.ScaleFactors;
Modified:
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
---
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
(original)
+++
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/Comments.java
Tue Feb 24 06:13:15 2009
@@ -49,7 +49,7 @@
ratings = new int[commentCount];
for (int i = 0; i < users.length; i++) {
users[i] = r.random(1, ScaleFactors.users);;
- comments[i] = r.makeCString(250, 1000);
+ comments[i] = r.makeCString(250, 500);
ratings[i] = r.random(2, 5);
}
createdTimestamp = r.makeDateInInterval( //createdtimestamp
Modified:
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
---
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
(original)
+++
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/loader/SocialEvent.java
Tue Feb 24 06:13:15 2009
@@ -50,8 +50,8 @@
ThreadResource tr = ThreadResource.getInstance();
Random r = tr.getRandom();
StringBuilder buffer = tr.getBuffer();
- fields[0] = RandomUtil.randomText(r, 20, 50); //title
- fields[1] = RandomUtil.randomText(r, 500, 2000); // description
+ fields[0] = RandomUtil.randomText(r, 20, 100); //title
+ fields[1] = RandomUtil.randomText(r, 250, 500); // description
fields[2] = RandomUtil.randomPhone(r, buffer); //phone
DateFormat dateFormat = tr.getDateFormat(); // eventtimestamp
String eventDate = dateFormat.format(
@@ -62,7 +62,7 @@
fields[3] = String.format("%s %02d:%s:00",
eventDate, eventHr, eventMin);
fields[4] = eventDate; // eventdate
- fields[5] = RandomUtil.randomText(r, 50, 200); // summary
+ fields[5] = RandomUtil.randomText(r, 50, 100); // summary
createdTimestamp = r.makeDateInInterval( //createdtimestamp
BASE_DATE, -540, 0);
Modified:
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
URL:
http://svn.apache.org/viewvc/incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java?rev=747285&r1=747284&r2=747285&view=diff
==============================================================================
---
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
(original)
+++
incubator/olio/workload/rails/trunk/src/org/apache/olio/workload/util/MemCacheUtility.java
Tue Feb 24 06:13:15 2009
@@ -225,7 +225,7 @@
public static void main (String[] args) {
if (args==null || args.length < 4) {//minimum amount of args - one
server, -s, -e, -i
- System.out.println("Usage: java com.sun.web20.MemCacheUtility
server:port [server2:port server3:port] -s startTime -e endTime -i interval");
+ System.out.println("Usage: java
org.apache.olio.workload.util.MemCacheUtility server:port [server2:port
server3:port] -s startTime -e endTime -i interval");
System.out.println(" where startTime = ramp up time in seconds.
Statistics collection will NOT occur during ramp up time and will sleep for
startTime period");
System.out.println(" endTime = steady State time in seconds.
Statistics collection will only occur during the steady state period");
System.out.println(" interval = time between statistics collection
snapshots, in seconds.");
