Bring Harry into C* Tree

Patch by Alex Petrov; reviewed by Caleb Rackliffe and Marcus Eriksson for CASSANDRA-19210.
pauloricardomg · Dec 23, 2023 · 439d1b1 · 439d1b1
1 parent b757dad
commit 439d1b1
Show file tree

Hide file tree

Showing 180 changed files with 25,067 additions and 2,575 deletions.
diff --git a/.build/cassandra-build-deps-template.xml b/.build/cassandra-build-deps-template.xml
@@ -106,10 +106,6 @@
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-junit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cassandra</groupId>
-      <artifactId>harry-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.junit</groupId>
       <artifactId>junit-bom</artifactId>

diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
@@ -513,12 +513,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.apache.cassandra</groupId>
-        <artifactId>harry-core</artifactId>
-        <version>0.0.2</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.reflections</groupId>
         <artifactId>reflections</artifactId>

diff --git a/build.xml b/build.xml
@@ -87,6 +87,7 @@
     <property name="test.simulator-asm.src" value="${test.dir}/simulator/asm"/>
     <property name="test.simulator-bootstrap.src" value="${test.dir}/simulator/bootstrap"/>
     <property name="test.simulator-test.src" value="${test.dir}/simulator/test"/>
+    <property name="test.harry.src" value="${test.dir}/harry/main"/>
     <property name="test.driver.connection_timeout_ms" value="10000"/>
     <property name="test.driver.read_timeout_ms" value="24000"/>
     <property name="test.jvm.args" value="" />
@@ -1043,6 +1044,7 @@
      <src path="${test.simulator-asm.src}"/>
      <src path="${test.simulator-bootstrap.src}"/>
      <src path="${test.simulator-test.src}"/>
+     <src path="${test.harry.src}"/>
      <compilerarg line="${jdk11plus-javac-exports}"/>
     </javac>
 

diff --git a/ide/idea-iml-file.xml b/ide/idea-iml-file.xml
@@ -41,6 +41,7 @@
             <sourceFolder url="file://$MODULE_DIR$/test/simulator/bootstrap" isTestSource="true" />
             <sourceFolder url="file://$MODULE_DIR$/test/simulator/main" isTestSource="true" />
             <sourceFolder url="file://$MODULE_DIR$/test/simulator/test" isTestSource="true" />
+            <sourceFolder url="file://$MODULE_DIR$/test/harry/main" isTestSource="true" />
             <sourceFolder url="file://$MODULE_DIR$/test/resources" type="java-test-resource" />
             <sourceFolder url="file://$MODULE_DIR$/test/conf" type="java-test-resource" />
             <excludeFolder url="file://$MODULE_DIR$/.idea" />

diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -566,6 +566,7 @@ public enum CassandraRelevantProperties
      * faster. Note that this is disabled for unit tests but if an individual test requires schema to be flushed, it
      * can be also done manually for that particular case: {@code flush(SchemaConstants.SCHEMA_KEYSPACE_NAME);}. */
     TEST_FLUSH_LOCAL_SCHEMA_CHANGES("cassandra.test.flush_local_schema_changes", "true"),
+    TEST_HARRY_SWITCH_AFTER("cassandra.test.harry.progression.switch-after", "1"),
     TEST_IGNORE_SIGAR("cassandra.test.ignore_sigar"),
     TEST_INVALID_LEGACY_SSTABLE_ROOT("invalid-legacy-sstable-root"),
     TEST_JVM_DTEST_DISABLE_SSL("cassandra.test.disable_ssl"),

diff --git a/test/conf/harry-generic.yaml b/test/conf/harry-generic.yaml
diff --git a/...uted/org/apache/cassandra/distributed/fuzz/ConcurrentQuiescentCheckerIntegrationTest.java b/...uted/org/apache/cassandra/distributed/fuzz/ConcurrentQuiescentCheckerIntegrationTest.java