From c23854ebfde0a4a7924798ef582d3cd631477988 Mon Sep 17 00:00:00 2001
From: Keith Turner <kturner@apache.org>
Date: Thu, 8 Aug 2019 19:59:44 -0400
Subject: [PATCH 1/3] Stresso now builds and runs against Fluo 1.3.0-SNAP

---
 stresso/bin/build.sh                          |  2 +-
 stresso/pom.xml                               | 33 ++++++++++++++++---
 .../main/java/stresso/trie/AccumuloUtil.java  |  7 ++--
 .../src/main/java/stresso/trie/Generate.java  |  2 +-
 stresso/src/main/java/stresso/trie/Init.java  |  2 +-
 stresso/src/main/java/stresso/trie/Load.java  |  6 ++--
 stresso/src/main/java/stresso/trie/Print.java |  5 +++
 .../src/main/java/stresso/trie/Unique.java    |  2 +-
 stresso/src/test/java/stresso/ITBase.java     |  2 +-
 .../src/test/java/stresso/TrieBasicIT.java    |  4 ++-
 .../src/test/java/stresso/TrieMapRedIT.java   | 27 ++++++++-------
 .../test/java/stresso/TrieStopLevelIT.java    |  3 +-
 12 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/stresso/bin/build.sh b/stresso/bin/build.sh
index a290361..0178b55 100755
--- a/stresso/bin/build.sh
+++ b/stresso/bin/build.sh
@@ -32,4 +32,4 @@ mkdir -p lib
 # populate lib dir used by fluo init
 rm -f lib/*
 cp target/stresso-0.0.1-SNAPSHOT.jar ./lib/
-mvn dependency:copy-dependencies  -DincludeArtifactIds=fluo-recipes-core -DoutputDirectory=./lib
+mvn dependency:copy-dependencies  -DincludeArtifactIds=fluo-recipes-core,commons-collections -DoutputDirectory=./lib
diff --git a/stresso/pom.xml b/stresso/pom.xml
index bc3c66d..a049ead 100644
--- a/stresso/pom.xml
+++ b/stresso/pom.xml
@@ -29,12 +29,13 @@
   <description>This repo contains an example application designed to stress Apache Fluo</description>
   <url>https://github.com/astralway/stresso</url>
   <properties>
-    <accumulo-plugin.version>2.0.0-SNAPSHOT</accumulo-plugin.version>
-    <accumulo.version>2.0.0-alpha-2</accumulo.version>
+    <accumulo-plugin.version>1.0.0</accumulo-plugin.version>
+    <accumulo.version>2.0.0</accumulo.version>
     <fluo-recipes.version>1.2.0</fluo-recipes.version>
-    <fluo.version>1.2.0</fluo.version>
-    <hadoop.version>3.1.1</hadoop.version>
+    <fluo.version>1.3.0-SNAPSHOT</fluo.version>
+    <hadoop.version>3.2.0</hadoop.version>
     <slf4j.version>1.7.12</slf4j.version>
+    <zookeeper.version>3.4.14</zookeeper.version>
   </properties>
   <!--
        The provided scope is used for dependencies that should not end up in
@@ -209,12 +210,34 @@
         <plugins>
           <plugin>
             <groupId>org.apache.accumulo</groupId>
-            <artifactId>accumulo-maven-plugin</artifactId>
+            <artifactId>accumulo2-maven-plugin</artifactId>
             <version>${accumulo-plugin.version}</version>
             <configuration>
               <instanceName>it-instance-maven</instanceName>
               <rootPassword>ITSecret</rootPassword>
             </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.accumulo</groupId>
+                <artifactId>accumulo-minicluster</artifactId>
+                <version>${accumulo.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client-api</artifactId>
+                <version>${hadoop.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client-runtime</artifactId>
+                <version>${hadoop.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
                 <id>run-plugin</id>
diff --git a/stresso/src/main/java/stresso/trie/AccumuloUtil.java b/stresso/src/main/java/stresso/trie/AccumuloUtil.java
index fbe09bb..d48b3c7 100644
--- a/stresso/src/main/java/stresso/trie/AccumuloUtil.java
+++ b/stresso/src/main/java/stresso/trie/AccumuloUtil.java
@@ -45,10 +45,11 @@ public static <T> T getTableOp(FluoConfiguration fc, TableOp<T> tableOp) {
     try (FluoAdmin fadmin = FluoFactory.newAdmin(fc)) {
       FluoConfiguration appCfg = new FluoConfiguration(fadmin.getApplicationConfig());
       appCfg.setApplicationName(fc.getApplicationName());
-      AccumuloClient client =
+      try (AccumuloClient client =
           Accumulo.newClient().to(appCfg.getAccumuloInstance(), appCfg.getAccumuloZookeepers())
-              .as(appCfg.getAccumuloUser(), appCfg.getAccumuloPassword()).build();
-      return tableOp.run(client.tableOperations(), appCfg.getAccumuloTable());
+              .as(appCfg.getAccumuloUser(), appCfg.getAccumuloPassword()).build()) {
+        return tableOp.run(client.tableOperations(), appCfg.getAccumuloTable());
+      }
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
diff --git a/stresso/src/main/java/stresso/trie/Generate.java b/stresso/src/main/java/stresso/trie/Generate.java
index d4d7bbd..e14d59c 100644
--- a/stresso/src/main/java/stresso/trie/Generate.java
+++ b/stresso/src/main/java/stresso/trie/Generate.java
@@ -135,7 +135,7 @@ public int run(String[] args) throws Exception {
     if (args.length != 4) {
       log.error("Usage: " + this.getClass().getSimpleName()
           + " <numMappers> <numbersPerMapper> <max> <output dir>");
-      System.exit(-1);
+      return -1;
     }
 
     int numMappers = Integer.parseInt(args[0]);
diff --git a/stresso/src/main/java/stresso/trie/Init.java b/stresso/src/main/java/stresso/trie/Init.java
index a819681..fdefb16 100644
--- a/stresso/src/main/java/stresso/trie/Init.java
+++ b/stresso/src/main/java/stresso/trie/Init.java
@@ -134,7 +134,7 @@ public int run(String[] args) throws Exception {
     if (args.length != 4) {
       System.err.println("Usage: " + this.getClass().getSimpleName()
           + "  <fluo conn props> <app name> <input dir> <tmp dir>");
-      System.exit(-1);
+      return -1;
     }
 
     FluoConfiguration props = new FluoConfiguration(new File(args[0]));
diff --git a/stresso/src/main/java/stresso/trie/Load.java b/stresso/src/main/java/stresso/trie/Load.java
index d457493..12cac43 100644
--- a/stresso/src/main/java/stresso/trie/Load.java
+++ b/stresso/src/main/java/stresso/trie/Load.java
@@ -52,9 +52,9 @@ protected void map(LongWritable key, NullWritable val, Context context)
   public int run(String[] args) throws Exception {
 
     if (args.length != 3) {
-      log.error(
-          "Usage: " + this.getClass().getSimpleName() + "<fluo conn props> <app name> <input dir>");
-      System.exit(-1);
+      log.error("Usage: " + this.getClass().getSimpleName()
+          + " <fluo conn props> <app name> <input dir>");
+      return -1;
     }
 
     FluoConfiguration props = new FluoConfiguration(new File(args[0]));
diff --git a/stresso/src/main/java/stresso/trie/Print.java b/stresso/src/main/java/stresso/trie/Print.java
index a55293c..87498ec 100644
--- a/stresso/src/main/java/stresso/trie/Print.java
+++ b/stresso/src/main/java/stresso/trie/Print.java
@@ -65,6 +65,11 @@ public boolean equals(Object o) {
 
       return false;
     }
+
+    @Override
+    public int hashCode() {
+      throw new UnsupportedOperationException();
+    }
   }
 
   public static Stats getStats(SimpleConfiguration config) throws Exception {
diff --git a/stresso/src/main/java/stresso/trie/Unique.java b/stresso/src/main/java/stresso/trie/Unique.java
index 0a25b1b..d22fd1e 100644
--- a/stresso/src/main/java/stresso/trie/Unique.java
+++ b/stresso/src/main/java/stresso/trie/Unique.java
@@ -69,7 +69,7 @@ public int run(String[] args) throws Exception {
 
     if (args.length < 1) {
       log.error("Usage: " + this.getClass().getSimpleName() + "<input dir>{ <input dir>}");
-      System.exit(-1);
+      return -1;
     }
 
     JobConf job = new JobConf(getConf());
diff --git a/stresso/src/test/java/stresso/ITBase.java b/stresso/src/test/java/stresso/ITBase.java
index 40385a4..abee237 100644
--- a/stresso/src/test/java/stresso/ITBase.java
+++ b/stresso/src/test/java/stresso/ITBase.java
@@ -65,7 +65,7 @@ public class ITBase {
   @BeforeClass
   public static void setUpAccumulo() throws Exception {
     instanceName = System.getProperty(IT_INSTANCE_NAME_PROP, "it-instance-default");
-    File instanceDir = new File("target/accumulo-maven-plugin/" + instanceName);
+    File instanceDir = new File("target/accumulo2-maven-plugin/" + instanceName);
     boolean instanceClear =
         System.getProperty(IT_INSTANCE_CLEAR_PROP, "true").equalsIgnoreCase("true");
     if (instanceDir.exists() && instanceClear) {
diff --git a/stresso/src/test/java/stresso/TrieBasicIT.java b/stresso/src/test/java/stresso/TrieBasicIT.java
index 4735d95..9b9b25d 100644
--- a/stresso/src/test/java/stresso/TrieBasicIT.java
+++ b/stresso/src/test/java/stresso/TrieBasicIT.java
@@ -36,6 +36,7 @@
 import stresso.trie.Node;
 import stresso.trie.NodeObserver;
 import stresso.trie.NumberLoader;
+import stresso.trie.StressoObserverProvider;
 
 import static stresso.trie.Constants.COUNT_SEEN_COL;
 import static stresso.trie.Constants.TYPEL;
@@ -49,7 +50,7 @@ public class TrieBasicIT extends ITBase {
 
   @Override
   protected void preInit(FluoConfiguration conf) {
-    conf.addObserver(new ObserverSpecification(NodeObserver.class.getName()));
+    conf.setObserverProvider(StressoObserverProvider.class);
     conf.getAppConfiguration().setProperty(Constants.STOP_LEVEL_PROP, 0);
   }
 
@@ -111,6 +112,7 @@ private void runTrieTest(int ingestNum, int maxValue, int nodeSize) throws Excep
         if (result == null) {
           log.error("Could not find root node");
           FluoITHelper.printFluoTable(client);
+          result = 0;
         } else if (!result.equals(uniqueNum)) {
           log.error(
               "Count (" + result + ") at root node does not match expected (" + uniqueNum + "):");
diff --git a/stresso/src/test/java/stresso/TrieMapRedIT.java b/stresso/src/test/java/stresso/TrieMapRedIT.java
index c88d760..a7a13f0 100644
--- a/stresso/src/test/java/stresso/TrieMapRedIT.java
+++ b/stresso/src/test/java/stresso/TrieMapRedIT.java
@@ -37,6 +37,7 @@
 import stresso.trie.Load;
 import stresso.trie.NodeObserver;
 import stresso.trie.Print;
+import stresso.trie.StressoObserverProvider;
 import stresso.trie.Unique;
 
 /**
@@ -46,7 +47,7 @@ public class TrieMapRedIT extends ITBase {
 
   @Override
   protected void preInit(FluoConfiguration conf) {
-    conf.addObserver(new ObserverSpecification(NodeObserver.class.getName()));
+    conf.setObserverProvider(StressoObserverProvider.class);
 
     SimpleConfiguration appCfg = conf.getAppConfiguration();
     appCfg.setProperty(Constants.STOP_LEVEL_PROP, 0);
@@ -60,16 +61,19 @@ static void generate(int numMappers, int numPerMapper, int max, File out1) throw
     Assert.assertEquals(0, ret);
   }
 
-  static void load(int nodeSize, File fluoPropsFile, File input) throws Exception {
-    int ret = ToolRunner.run(new Load(), new String[] {"-D", "mapred.job.tracker=local", "-D",
-        "fs.defaultFS=file:///", fluoPropsFile.getAbsolutePath(), input.toURI().toString()});
+  static void load(int nodeSize, File fluoPropsFile, String appName, File input) throws Exception {
+    int ret = ToolRunner.run(new Load(),
+        new String[] {"-D", "mapred.job.tracker=local", "-D", "fs.defaultFS=file:///",
+            fluoPropsFile.getAbsolutePath(), appName, input.toURI().toString()});
     Assert.assertEquals(0, ret);
   }
 
-  static void init(int nodeSize, File fluoPropsFile, File input, File tmp) throws Exception {
+  static void init(int nodeSize, File fluoPropsFile, String appName, File input, File tmp)
+      throws Exception {
     int ret = ToolRunner.run(new Init(),
         new String[] {"-D", "mapred.job.tracker=local", "-D", "fs.defaultFS=file:///",
-            fluoPropsFile.getAbsolutePath(), input.toURI().toString(), tmp.toURI().toString()});
+            fluoPropsFile.getAbsolutePath(), appName, input.toURI().toString(),
+            tmp.toURI().toString()});
     Assert.assertEquals(0, ret);
   }
 
@@ -90,15 +94,16 @@ static int unique(File... dirs) throws Exception {
   public void testEndToEnd() throws Exception {
     File testDir = new File("target/MRIT");
     FileUtils.deleteQuietly(testDir);
-    testDir.mkdirs();
+    Assert.assertTrue(testDir.mkdirs());
     File fluoPropsFile = new File(testDir, "fluo.props");
 
     config.save(fluoPropsFile);
+    String appName = config.getApplicationName();
 
     File out1 = new File(testDir, "nums-1");
 
     generate(2, 100, 500, out1);
-    init(8, fluoPropsFile, out1, new File(testDir, "initTmp"));
+    init(8, fluoPropsFile, appName, out1, new File(testDir, "initTmp"));
     int ucount = unique(out1);
 
     Assert.assertTrue(ucount > 0);
@@ -108,7 +113,7 @@ public void testEndToEnd() throws Exception {
     Assert.assertEquals(new Print.Stats(0, ucount, false), Print.getStats(config));
 
     // reload same data
-    load(8, fluoPropsFile, out1);
+    load(8, fluoPropsFile, appName, out1);
 
     miniFluo.waitForObservers();
 
@@ -117,7 +122,7 @@ public void testEndToEnd() throws Exception {
     // load some new data
     File out2 = new File(testDir, "nums-2");
     generate(2, 100, 500, out2);
-    load(8, fluoPropsFile, out2);
+    load(8, fluoPropsFile, appName, out2);
     int ucount2 = unique(out1, out2);
     Assert.assertTrue(ucount2 > ucount); // used > because the probability that no new numbers are
                                          // chosen is exceedingly small
@@ -128,7 +133,7 @@ public void testEndToEnd() throws Exception {
 
     File out3 = new File(testDir, "nums-3");
     generate(2, 100, 500, out3);
-    load(8, fluoPropsFile, out3);
+    load(8, fluoPropsFile, appName, out3);
     int ucount3 = unique(out1, out2, out3);
     Assert.assertTrue(ucount3 > ucount2); // used > because the probability that no new numbers are
                                           // chosen is exceedingly small
diff --git a/stresso/src/test/java/stresso/TrieStopLevelIT.java b/stresso/src/test/java/stresso/TrieStopLevelIT.java
index d7822e0..c2bb6db 100644
--- a/stresso/src/test/java/stresso/TrieStopLevelIT.java
+++ b/stresso/src/test/java/stresso/TrieStopLevelIT.java
@@ -27,12 +27,13 @@
 import stresso.trie.Constants;
 import stresso.trie.Node;
 import stresso.trie.NodeObserver;
+import stresso.trie.StressoObserverProvider;
 
 public class TrieStopLevelIT extends TrieMapRedIT {
 
   @Override
   protected void preInit(FluoConfiguration conf) {
-    conf.addObserver(new ObserverSpecification(NodeObserver.class.getName()));
+    conf.setObserverProvider(StressoObserverProvider.class);
 
     SimpleConfiguration appCfg = conf.getAppConfiguration();
     appCfg.setProperty(Constants.STOP_LEVEL_PROP, 7);

From 7dbc9e685605063f49869677c24e836e263cf8a0 Mon Sep 17 00:00:00 2001
From: Keith Turner <kturner@apache.org>
Date: Sat, 15 Apr 2023 16:24:06 -0400
Subject: [PATCH 2/3] updates build script to use runtime versions for copydep

---
 stresso/bin/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stresso/bin/build.sh b/stresso/bin/build.sh
index 0178b55..561e784 100755
--- a/stresso/bin/build.sh
+++ b/stresso/bin/build.sh
@@ -32,4 +32,4 @@ mkdir -p lib
 # populate lib dir used by fluo init
 rm -f lib/*
 cp target/stresso-0.0.1-SNAPSHOT.jar ./lib/
-mvn dependency:copy-dependencies  -DincludeArtifactIds=fluo-recipes-core,commons-collections -DoutputDirectory=./lib
+mvn dependency:copy-dependencies -Dfluo.version=$FLUO_VERSION -Daccumulo.version=$ACCUMULO_VERSION -DincludeArtifactIds=fluo-recipes-core,commons-collections -DoutputDirectory=./lib

From 1e50cacf1a047a4f97366b75a589b7e05c4d2b5a Mon Sep 17 00:00:00 2001
From: Keith Turner <kturner@apache.org>
Date: Tue, 18 Apr 2023 09:12:49 -0400
Subject: [PATCH 3/3] updates dependency versions

---
 stresso/pom.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/stresso/pom.xml b/stresso/pom.xml
index a049ead..876a4d5 100644
--- a/stresso/pom.xml
+++ b/stresso/pom.xml
@@ -30,12 +30,14 @@
   <url>https://github.com/astralway/stresso</url>
   <properties>
     <accumulo-plugin.version>1.0.0</accumulo-plugin.version>
-    <accumulo.version>2.0.0</accumulo.version>
+    <accumulo.version>2.1.0</accumulo.version>
+    <!-- Prevent findbugs from runnning because it does not work with Java 11 and is configured to run by parent pom. -->
+    <findbugs.skip>true</findbugs.skip>
     <fluo-recipes.version>1.2.0</fluo-recipes.version>
-    <fluo.version>1.3.0-SNAPSHOT</fluo.version>
-    <hadoop.version>3.2.0</hadoop.version>
-    <slf4j.version>1.7.12</slf4j.version>
-    <zookeeper.version>3.4.14</zookeeper.version>
+    <fluo.version>2.0.0</fluo.version>
+    <hadoop.version>3.3.5</hadoop.version>
+    <slf4j.version>1.7.36</slf4j.version>
+    <zookeeper.version>3.8.1</zookeeper.version>
   </properties>
   <!--
        The provided scope is used for dependencies that should not end up in