Author: eevans
Date: Wed Jan 5 20:36:35 2011
New Revision: 1055626
URL: http://svn.apache.org/viewvc?rev=1055626&view=rev
Log:
merge w/ 0.7 branch
Added:
cassandra/trunk/test/distributed/
- copied from r1055624, cassandra/branches/cassandra-0.7/test/distributed/
cassandra/trunk/test/distributed/README.txt
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/README.txt
cassandra/trunk/test/distributed/ivy.xml
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/ivy.xml
cassandra/trunk/test/distributed/org/
- copied from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/
cassandra/trunk/test/distributed/org/apache/
- copied from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/
cassandra/trunk/test/distributed/org/apache/cassandra/
- copied from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/
cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/CassandraServiceController.java
cassandra/trunk/test/distributed/org/apache/cassandra/MovementTest.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/MovementTest.java
cassandra/trunk/test/distributed/org/apache/cassandra/MutationTest.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/MutationTest.java
cassandra/trunk/test/distributed/org/apache/cassandra/TestBase.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/TestBase.java
cassandra/trunk/test/distributed/org/apache/cassandra/utils/
- copied from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/utils/
cassandra/trunk/test/distributed/org/apache/cassandra/utils/BlobUtils.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/utils/BlobUtils.java
cassandra/trunk/test/distributed/org/apache/cassandra/utils/KeyPair.java
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/distributed/org/apache/cassandra/utils/KeyPair.java
cassandra/trunk/test/resources/whirr-default.properties
- copied unchanged from r1055624,
cassandra/branches/cassandra-0.7/test/resources/whirr-default.properties
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/build.xml
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/ivysettings.xml
cassandra/trunk/lib/high-scale-lib.jar
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7:1026516-1055325
+/cassandra/branches/cassandra-0.7:1026516-1055624
/cassandra/branches/cassandra-0.7.0:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3:774578-796573
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1055626&r1=1055625&r2=1055626&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Jan 5 20:36:35 2011
@@ -17,6 +17,7 @@
* implement describeOwnership for BOP, COPP (CASSANDRA-1928)
* make read repair behave as expected for ConsistencyLevel > ONE
(CASSANDRA-982)
+ * distributed test harness (CASSANDRA-1859)
0.7.0-rc4
Modified: cassandra/trunk/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1055626&r1=1055625&r2=1055626&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Wed Jan 5 20:36:35 2011
@@ -41,12 +41,14 @@
<property name="interface.avro.dir" value="${interface.dir}/avro"/>
<property name="test.dir" value="${basedir}/test"/>
<property name="test.resources" value="${test.dir}/resources"/>
+ <property name="test.lib" value="${build.dir}/test/lib"/>
<property name="test.classes" value="${build.dir}/test/classes"/>
<property name="test.conf" value="${test.dir}/conf"/>
<property name="test.data" value="${test.dir}/data"/>
<property name="test.name" value="*Test"/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
+ <property name="test.distributed.src" value="${test.dir}/distributed"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="base.version" value="0.7.0-rc4"/>
<condition property="version" value="${base.version}">
@@ -108,6 +110,7 @@
<fail unless="is.source.artifact"
message="Not a source artifact, stopping here." />
<mkdir dir="${build.classes}"/>
+ <mkdir dir="${test.lib}"/>
<mkdir dir="${test.classes}"/>
<mkdir dir="${build.src.gen-java}"/>
</target>
@@ -189,10 +192,17 @@
</target>
<target name="ivy-retrieve-build" depends="ivy-init">
+ <ivy:resolve file="${basedir}/ivy.xml"/>
<ivy:retrieve type="jar,source" sync="true"
pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
</target>
+ <target name="ivy-retrieve-test" depends="ivy-init">
+ <ivy:resolve file="${basedir}/test/distributed/ivy.xml"/>
+ <ivy:retrieve type="jar,source" sync="true"
+ pattern="${test.lib}/[type]s/[artifact]-[revision].[ext]" />
+ </target>
+
<!--
Generate avro code
-->
@@ -479,28 +489,49 @@
</copy>
</target>
+ <target name="build-distributed-test" depends="build-test,ivy-retrieve-test"
description="Compile distributed test classes (which have additional deps)">
+ <javac
+ debug="true"
+ debuglevel="${debuglevel}"
+ destdir="${test.classes}">
+ <classpath>
+ <path refid="cassandra.classpath"/>
+ <pathelement location="${test.classes}"/>
+ <fileset dir="${test.lib}">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
+ <src path="${test.distributed.src}"/>
+ </javac>
+ </target>
+
<macrodef name="testmacro">
<attribute name="suitename" />
<attribute name="inputdir" />
<attribute name="timeout" />
+ <attribute name="forkmode" default="perTest"/>
+ <element name="optjvmargs" implicit="true" optional="true" />
<sequential>
<echo message="running @{suitename} tests"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
- <junit fork="on" failureproperty="testfailed" maxmemory="1024m"
timeout="@{timeout}">
+ <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed"
maxmemory="1024m" timeout="@{timeout}">
<sysproperty key="net.sourceforge.cobertura.datafile"
file="${cobertura.datafile}"/>
<formatter type="xml" usefile="true"/>
<formatter type="brief" usefile="false"/>
<jvmarg value="-Dstorage-config=${test.conf}"/>
<jvmarg value="-Daccess.properties=${test.conf}/access.properties"/>
<jvmarg value="-Dlog4j.configuration=log4j-junit.properties" />
- <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-ea"/>
+ <optjvmargs/>
<classpath>
<path refid="cassandra.classpath" />
<pathelement location="${test.classes}"/>
<pathelement location="${cobertura.dir}/cobertura.jar"/>
<pathelement location="${test.conf}"/>
+ <fileset dir="${test.lib}">
+ <include name="**/*.jar" />
+ </fileset>
</classpath>
<batchtest todir="${build.test.dir}/output">
<fileset dir="@{inputdir}" includes="**/${test.name}.java" />
@@ -511,8 +542,9 @@
</macrodef>
<target name="test" depends="build-test" description="Execute unit tests">
- <testmacro suitename="unit" inputdir="${test.unit.src}"
- timeout="${test.timeout}" />
+ <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000">
+ <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+ </testmacro>
</target>
<target name="long-test" depends="build-test" description="Execute
functional tests">
@@ -520,6 +552,14 @@
timeout="${test.long.timeout}" />
</target>
+ <!-- Depends on artifacts so that we can push a tarball to remote nodes, and
has its own build target for cloudy deps. -->
+ <target name="distributed-test" depends="build-distributed-test,artifacts"
description="Execute distributed tests: see ${test.distributed.src}/README.txt">
+ <testmacro suitename="distributed" inputdir="${test.distributed.src}"
timeout="1200000" forkmode="once">
+ <jvmarg value="-Dwhirr.config=${whirr.config}"/>
+ <jvmarg
value="-Dwhirr.cassandra_tarball=${build.dir}/${final.name}-bin.tar.gz"/>
+ </testmacro>
+ </target>
+
<!-- instruments the classes to later create code coverage reports -->
<target name="cobertura-instrument" depends="build,build-test">
<taskdef resource="tasks.properties">
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1055325
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1055624
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1055325
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1055624
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1055325
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1055624
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1055325
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1055624
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 5 20:36:35 2011
@@ -1,5 +1,5 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1055311
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1055325
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1055624
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1054631
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
Modified: cassandra/trunk/ivysettings.xml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/ivysettings.xml?rev=1055626&r1=1055625&r2=1055626&view=diff
==============================================================================
--- cassandra/trunk/ivysettings.xml (original)
+++ cassandra/trunk/ivysettings.xml Wed Jan 5 20:36:35 2011
@@ -17,17 +17,18 @@
~ under the License.
-->
<ivysettings>
- <settings defaultResolver="ibiblio"/>
+ <settings defaultResolver="chain"/>
<resolvers>
<chain name="chain" dual="true">
- <ibiblio name="java.net2" root="http://download.java.net/maven/2/";
m2compatible="true"/>
- <ibiblio name="cloudera"
root="https://repository.cloudera.com/content/repositories/releases/";
m2compatible="true" />
- <ibiblio name="ibiblio" m2compatible="true" />
+ <ibiblio name="ibiblio"
m2compatible="true"/>
+ <ibiblio name="java.net2" root="http://download.java.net/maven/2/";
m2compatible="true"/>
+ <ibiblio name="apache"
root="https://repository.apache.org/content/repositories/releases/";
m2compatible="true"/>
+ <ibiblio name="cloudera"
root="https://repository.cloudera.com/content/repositories/releases/";
m2compatible="true"/>
+ <!-- for distributed tests -->
+ <ibiblio name="jclouds" root="http://jclouds.googlecode.com/svn/repo";
m2compatible="true"/>
+ <ibiblio name="oauth"
root="http://oauth.googlecode.com/svn/code/maven";
m2compatible="true"/>
+ <ibiblio name="twttr" root="http://maven.twttr.com/";
m2compatible="true"/>
</chain>
</resolvers>
- <modules>
- <module organisation="net.java.dev.jna" name="jna" resolver="chain" />
- <module organisation="com.cloudera.hadoop" name="*" resolver="chain" />
- </modules>
</ivysettings>
Modified: cassandra/trunk/lib/high-scale-lib.jar
URL:
http://svn.apache.org/viewvc/cassandra/trunk/lib/high-scale-lib.jar?rev=1055626&r1=1055625&r2=1055626&view=diff
==============================================================================
Binary files - no diff available.
