Author: [email protected]
Date: Tue Oct 18 10:34:46 2011
New Revision: 1521
Log:
[AMDATUCASSANDRA-113] Applied changes needed for new performance test framework
version, enhances jmeter plan with simple GET test
Modified:
trunk/amdatu-cassandra/release/pom.xml
trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/RESTPerformanceTest.java
trunk/amdatu-cassandra/test-performance/test-execution/pom.xml
trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
Cassandra PM.jmx
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties
Modified: trunk/amdatu-cassandra/release/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/release/pom.xml (original)
+++ trunk/amdatu-cassandra/release/pom.xml Tue Oct 18 10:34:46 2011
@@ -49,6 +49,12 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
<scope>runtime</scope>
<type>bundle</type>
Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Tue Oct 18
10:34:46 2011
@@ -106,7 +106,7 @@
<instructions>
<Bundle-Activator>org.amdatu.test.performance.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.test.performance-bundle</Bundle-SymbolicName>
- <Embed-Dependency>json,utilities;scope=compile</Embed-Dependency>
+
<Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency>
<Import-Package>
org.amdatu.cassandra.application;version="[1.0,2.0)",
org.amdatu.cassandra.listener;version="[1.0,2.0)",
Modified:
trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/RESTPerformanceTest.java
==============================================================================
---
trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/RESTPerformanceTest.java
(original)
+++
trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/RESTPerformanceTest.java
Tue Oct 18 10:34:46 2011
@@ -54,10 +54,13 @@
createRowKeyTestSet();
m_logService.log(LogService.LOG_INFO, "Cassandra PM performance test
REST interface started");
}
-
+
+ // NB: each performance test bundle must implement a GET
/rest/performancetest/status. This is used
+ // by the launcher to detect if the REST performance test bundle is up and
running and so tests can
+ // be started.
@GET
@Produces({MediaType.TEXT_PLAIN})
- @Path("cassandra/status")
+ @Path("status")
public Response status() {
return buildOK("Cassandra performancetest service online");
}
Modified: trunk/amdatu-cassandra/test-performance/test-execution/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-execution/pom.xml
(original)
+++ trunk/amdatu-cassandra/test-performance/test-execution/pom.xml Tue Oct
18 10:34:46 2011
@@ -39,13 +39,6 @@
<scope>runtime</scope>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.test.performance.bundle</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
</dependencies>
<build>
Modified:
trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml
==============================================================================
---
trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml
(original)
+++
trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml
Tue Oct 18 10:34:46 2011
@@ -18,17 +18,6 @@
<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0
view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";>
- <dependencySets>
- <dependencySet>
- <outputDirectory>amdatu-versions</outputDirectory>
- <includes>
-
<include>org.amdatu.cassandra:org.amdatu.cassandra.test.performance.bundle</include>
- </includes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-
<fileSets>
<fileSet>
<directory>src/main/resources/amdatu-versions</directory>
Modified:
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
Cassandra PM.jmx
==============================================================================
---
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
Cassandra PM.jmx (original)
+++
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
Cassandra PM.jmx Tue Oct 18 10:34:46 2011
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010, 2011 The Amdatu Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.verning permissions and limitations
- under the License.
--->
<jmeterTestPlan version="1.2" properties="2.1">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Amdatu Web
Test Plan" enabled="true">
@@ -84,6 +68,26 @@
<boolProp name="CounterConfig.per_user">false</boolProp>
</CounterConfig>
<hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="HTTP Status" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/rest/performancetest/status</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
<HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Create private CF" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
<collectionProp name="Arguments.arguments"/>
Modified:
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties
==============================================================================
---
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties
(original)
+++
trunk/amdatu-cassandra/test-performance/test-execution/src/main/resources/shell/configuration.properties
Tue Oct 18 10:34:46 2011
@@ -15,41 +15,47 @@
# Java properties file for performance test execution.
+# Verbose will print all input arguments to the command line
+verbose=false
+
# Run a performance test
runtest=true
-# ... on all Amdatu versions available in directory:
-# NB: Copy the versions to this directory before running this test
-versiondir=amdatu-versions
+# Analyze the result of a performance test (can be combines with runtest)
+analyze=true
-# ... , execute the JMeter plans from the directory:
-jmeterplansdir=jmeter-plans
+# Run a verification, meaning that also a performance test is excuted of
+# version X against version X. This should obviously result in an outcome
+# stating that there is no significant difference in performance
+verify=true
-# ... , write the result to the directory:
-resultsdir=results
+# Executes the test for all Amdatu versions available in this directory
+# NB: Copy the versions to this directory before running this test
+versiondir=amdatu-versions
-# ... and use this as temporary directoy:
+# The temporary directoy in which all test execution takes place
tmpdir=tmp
-# Before execution of the test, remove the example bundles from the release
-noexamples=true
+# Removes the work directory just before starting Amdatu. Can be:
+# 0 - Do not remove work directory
+# 1 - Remove work directory, except for the bundle cache
+# 2 - Remove work directory completely
+clean=1
-# Run the HTTP service on port 2204
-port=2204
+# Execute the JMeter plans from the directory:
+jmeterplansdir=jmeter-plans
-# Run a verification, meaning that also a performance test is excuted of
-# version X against version X. This should obviously result in an outcome
-# stating that there is no significant difference in performance
-verify=true
+# Write the analyze results to the directory:
+resultsdir=results
-# Run 1 testloop
+# The amount of test loops to execute
testloops=50
-# Perform a statistics analysis after running the test
-analyze=true
-
-# ... but omit the first 50 results of each test run
+# Omit the first [amount] results of each test run, with the purpose of
reducing correlation between the results
omit=50
-# ... and use new samples Z where each sample Z is mean of m samples X-Y
-m=250
\ No newline at end of file
+# The amount of samples to define Z for; each sample Z is the mean of m
samples X-Y
+m=250
+
+# Run the HTTP service on port 2204
+port=2204
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
