From 956b4a9beb8f8035ea4aa45d73bff2eb629a28df Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Wed, 8 Sep 2021 13:19:49 -0400 Subject: [PATCH 1/6] Refactor error-throwing imports --- contrib/import-control.xml | 9 --------- .../org/apache/accumulo/testing/ingest/TestIngest.java | 4 ++-- .../org/apache/accumulo/testing/merkle/MerkleTree.java | 2 +- .../testing/performance/tests/HighSplitCreationPT.java | 4 ++-- .../testing/performance/tests/ScanExecutorPT.java | 3 +-- .../testing/performance/tests/SplitBalancingPT.java | 4 ++-- .../testing/randomwalk/concurrent/Replication.java | 8 ++++---- 7 files changed, 12 insertions(+), 22 deletions(-) diff --git a/contrib/import-control.xml b/contrib/import-control.xml index 840881f3..78a4a0ae 100644 --- a/contrib/import-control.xml +++ b/contrib/import-control.xml @@ -38,16 +38,7 @@ - - - - - - - - - diff --git a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java index 4fb90eeb..0fec1e96 100644 --- a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java +++ b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java @@ -35,7 +35,6 @@ import org.apache.accumulo.core.client.rfile.RFile; import org.apache.accumulo.core.client.rfile.RFileWriter; import org.apache.accumulo.core.client.security.SecurityErrorCode; -import org.apache.accumulo.core.clientImpl.TabletServerBatchWriter; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.data.ConstraintViolationSummary; import org.apache.accumulo.core.data.Key; @@ -184,7 +183,8 @@ public static void main(String[] args) { try (AccumuloClient client = Accumulo.newClient().from(opts.getClientProps()).build()) { if (opts.debug) - Logger.getLogger(TabletServerBatchWriter.class.getName()).setLevel(Level.TRACE); + Logger.getLogger("org.apache.accumulo.core.clientImpl.TabletServerBatchWriter") + .setLevel(Level.TRACE); // test batch update diff --git a/src/main/java/org/apache/accumulo/testing/merkle/MerkleTree.java b/src/main/java/org/apache/accumulo/testing/merkle/MerkleTree.java index cc7f810f..a9e213a1 100644 --- a/src/main/java/org/apache/accumulo/testing/merkle/MerkleTree.java +++ b/src/main/java/org/apache/accumulo/testing/merkle/MerkleTree.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.accumulo.core.util.Pair; +import org.apache.commons.math3.util.Pair; import com.google.common.collect.Iterables; diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java index 0678c1fc..df486872 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java +++ b/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java @@ -22,7 +22,6 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.testing.performance.Environment; import org.apache.accumulo.testing.performance.PerformanceTest; import org.apache.accumulo.testing.performance.Report; @@ -36,6 +35,7 @@ public class HighSplitCreationPT implements PerformanceTest { private static final int ONE_SECOND = 1000; private static final String TABLE_NAME = "highSplitCreation"; private static final String METADATA_TABLE_SPLITS = "123456789abcde"; + private static final String METADATA_TABLE_NAME = "accumulo.metadata"; @Override public SystemConfiguration getSystemConfig() { @@ -53,7 +53,7 @@ public Report runTest(final Environment env) throws Exception { AccumuloClient client = env.getClient(); client.tableOperations().create(TABLE_NAME); - client.tableOperations().addSplits(MetadataTable.NAME, getMetadataTableSplits()); + client.tableOperations().addSplits(METADATA_TABLE_NAME, getMetadataTableSplits()); SortedSet splits = getTestTableSplits(); diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/ScanExecutorPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/ScanExecutorPT.java index ae9b8c09..e59d4804 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/tests/ScanExecutorPT.java +++ b/src/main/java/org/apache/accumulo/testing/performance/tests/ScanExecutorPT.java @@ -35,7 +35,6 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.spi.scan.HintScanPrioritizer; import org.apache.accumulo.testing.performance.Environment; import org.apache.accumulo.testing.performance.PerformanceTest; import org.apache.accumulo.testing.performance.Report; @@ -57,7 +56,7 @@ public class ScanExecutorPT implements PerformanceTest { private static final int NUM_QUALS = 10; private static final String SCAN_EXECUTOR_THREADS = "2"; - private static final String SCAN_PRIORITIZER = HintScanPrioritizer.class.getName(); + private static final String SCAN_PRIORITIZER = "org.apache.accumulo.core.spi.scan.HintScanPrioritizer"; private static final String TEST_DESC = "Scan Executor Test. Test running lots of short scans " + "while long scans are running in the background. Each short scan reads a random row and " diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java index c88b241e..26b5932a 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java +++ b/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java @@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.testing.performance.Environment; import org.apache.accumulo.testing.performance.PerformanceTest; @@ -41,6 +40,7 @@ public class SplitBalancingPT implements PerformanceTest { private static final Logger LOG = LoggerFactory.getLogger(SplitBalancingPT.class); + private static final String METADATA_TABLE_NAME = "accumulo.metadata"; private static final String TABLE_NAME = "splitBalancing"; private static final String RESERVED_PREFIX = "~"; private static final int NUM_SPLITS = 1_000; @@ -97,7 +97,7 @@ private SortedSet getSplits() { private Map getTablets(final AccumuloClient client) { Map tablets = new HashMap<>(); - try (Scanner scanner = client.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) { + try (Scanner scanner = client.createScanner(METADATA_TABLE_NAME, Authorizations.EMPTY)) { scanner.fetchColumnFamily(TSERVER_ASSIGNED_TABLETS_COL_FAM); Range range = new Range(null, false, RESERVED_PREFIX, false); scanner.setRange(range); diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java index 71d8f65f..7f536544 100644 --- a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java +++ b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java @@ -46,7 +46,6 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.testing.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.randomwalk.State; @@ -65,6 +64,7 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti final String zookeepers = ClientProperty.INSTANCE_ZOOKEEPERS.getValue(c.properties()); final InstanceOperations iOps = c.instanceOperations(); final TableOperations tOps = c.tableOperations(); + final String replicationTableName = "accumulo.replication"; // Replicate to ourselves iOps.setProperty(REPLICATION_NAME.getKey(), instName); @@ -80,13 +80,13 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti iOps.setProperty(REPLICATION_WORK_PROCESSOR_PERIOD.getKey(), "1s"); // Ensure the replication table is online - ReplicationTable.setOnline(c); - boolean online = ReplicationTable.isOnline(c); + tOps.online(replicationTableName, true); + boolean online = tOps.isOnline(replicationTableName); for (int i = 0; i < 10; i++) { if (online) break; sleepUninterruptibly(2, TimeUnit.SECONDS); - online = ReplicationTable.isOnline(c); + online = tOps.isOnline(replicationTableName); } assertTrue("Replication table was not online", online); From c8b6cf42a254036dfa1b9f98c08f1205233ef3fe Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Wed, 8 Sep 2021 15:01:04 -0400 Subject: [PATCH 2/6] Move constants to TestProps.java --- src/main/java/org/apache/accumulo/testing/TestProps.java | 4 ++++ .../testing/performance/tests/HighSplitCreationPT.java | 4 ++-- .../testing/performance/tests/SplitBalancingPT.java | 5 +++-- .../testing/randomwalk/concurrent/Replication.java | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/accumulo/testing/TestProps.java b/src/main/java/org/apache/accumulo/testing/TestProps.java index f15ca31c..c4c8948f 100644 --- a/src/main/java/org/apache/accumulo/testing/TestProps.java +++ b/src/main/java/org/apache/accumulo/testing/TestProps.java @@ -46,6 +46,10 @@ public class TestProps { public static final String YARN_CONTAINER_MEMORY_MB = COMMON + "yarn.container.memory.mb"; // Number of cores given to each YARN container public static final String YARN_CONTAINER_CORES = COMMON + "yarn.container.cores"; + // Name of metadata table + public static final String METADATA_TABLE_NAME = "accumulo.metadata"; + // Name of replication table + public static final String REPLICATION_TABLE_NAME = "accumulo.replication"; /** Continuous ingest test properties **/ /** Common **/ diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java index df486872..186fbbf9 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java +++ b/src/main/java/org/apache/accumulo/testing/performance/tests/HighSplitCreationPT.java @@ -22,6 +22,7 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.AccumuloClient; +import org.apache.accumulo.testing.TestProps; import org.apache.accumulo.testing.performance.Environment; import org.apache.accumulo.testing.performance.PerformanceTest; import org.apache.accumulo.testing.performance.Report; @@ -35,7 +36,6 @@ public class HighSplitCreationPT implements PerformanceTest { private static final int ONE_SECOND = 1000; private static final String TABLE_NAME = "highSplitCreation"; private static final String METADATA_TABLE_SPLITS = "123456789abcde"; - private static final String METADATA_TABLE_NAME = "accumulo.metadata"; @Override public SystemConfiguration getSystemConfig() { @@ -53,7 +53,7 @@ public Report runTest(final Environment env) throws Exception { AccumuloClient client = env.getClient(); client.tableOperations().create(TABLE_NAME); - client.tableOperations().addSplits(METADATA_TABLE_NAME, getMetadataTableSplits()); + client.tableOperations().addSplits(TestProps.METADATA_TABLE_NAME, getMetadataTableSplits()); SortedSet splits = getTestTableSplits(); diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java index 26b5932a..e36c62ee 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java +++ b/src/main/java/org/apache/accumulo/testing/performance/tests/SplitBalancingPT.java @@ -28,6 +28,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.testing.TestProps; import org.apache.accumulo.testing.performance.Environment; import org.apache.accumulo.testing.performance.PerformanceTest; import org.apache.accumulo.testing.performance.Report; @@ -40,7 +41,6 @@ public class SplitBalancingPT implements PerformanceTest { private static final Logger LOG = LoggerFactory.getLogger(SplitBalancingPT.class); - private static final String METADATA_TABLE_NAME = "accumulo.metadata"; private static final String TABLE_NAME = "splitBalancing"; private static final String RESERVED_PREFIX = "~"; private static final int NUM_SPLITS = 1_000; @@ -97,7 +97,8 @@ private SortedSet getSplits() { private Map getTablets(final AccumuloClient client) { Map tablets = new HashMap<>(); - try (Scanner scanner = client.createScanner(METADATA_TABLE_NAME, Authorizations.EMPTY)) { + try (Scanner scanner = client.createScanner(TestProps.METADATA_TABLE_NAME, + Authorizations.EMPTY)) { scanner.fetchColumnFamily(TSERVER_ASSIGNED_TABLETS_COL_FAM); Range range = new Range(null, false, RESERVED_PREFIX, false); scanner.setRange(range); diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java index 7f536544..fb775b4d 100644 --- a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java +++ b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Replication.java @@ -47,6 +47,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.testing.TestProps; import org.apache.accumulo.testing.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.randomwalk.State; import org.apache.accumulo.testing.randomwalk.Test; @@ -64,7 +65,6 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti final String zookeepers = ClientProperty.INSTANCE_ZOOKEEPERS.getValue(c.properties()); final InstanceOperations iOps = c.instanceOperations(); final TableOperations tOps = c.tableOperations(); - final String replicationTableName = "accumulo.replication"; // Replicate to ourselves iOps.setProperty(REPLICATION_NAME.getKey(), instName); @@ -80,13 +80,13 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti iOps.setProperty(REPLICATION_WORK_PROCESSOR_PERIOD.getKey(), "1s"); // Ensure the replication table is online - tOps.online(replicationTableName, true); - boolean online = tOps.isOnline(replicationTableName); + tOps.online(TestProps.REPLICATION_TABLE_NAME, true); + boolean online = tOps.isOnline(TestProps.REPLICATION_TABLE_NAME); for (int i = 0; i < 10; i++) { if (online) break; sleepUninterruptibly(2, TimeUnit.SECONDS); - online = tOps.isOnline(replicationTableName); + online = tOps.isOnline(TestProps.REPLICATION_TABLE_NAME); } assertTrue("Replication table was not online", online); From 50488adb4b2e4c66a684ad50feceb69c8576541b Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Wed, 8 Sep 2021 15:12:54 -0400 Subject: [PATCH 3/6] Copy over FastFormat to acc-testing --- contrib/import-control.xml | 3 - .../testing/continuous/ContinuousIngest.java | 2 +- .../accumulo/testing/ingest/TestIngest.java | 2 +- .../testing/performance/util/TestData.java | 2 +- .../accumulo/testing/util/FastFormat.java | 67 +++++++++++++++++++ 5 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/apache/accumulo/testing/util/FastFormat.java diff --git a/contrib/import-control.xml b/contrib/import-control.xml index 78a4a0ae..0ca22ccd 100644 --- a/contrib/import-control.xml +++ b/contrib/import-control.xml @@ -37,9 +37,6 @@ - - - diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java index 0f6b04d4..66f5152b 100644 --- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java +++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java @@ -38,8 +38,8 @@ import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.core.util.FastFormat; import org.apache.accumulo.testing.TestProps; +import org.apache.accumulo.testing.util.FastFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java index 0fec1e96..0cd0024d 100644 --- a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java +++ b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java @@ -43,8 +43,8 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.core.util.FastFormat; import org.apache.accumulo.testing.cli.ClientOpts; +import org.apache.accumulo.testing.util.FastFormat; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.Text; diff --git a/src/main/java/org/apache/accumulo/testing/performance/util/TestData.java b/src/main/java/org/apache/accumulo/testing/performance/util/TestData.java index 66a7f7ea..e17106ee 100644 --- a/src/main/java/org/apache/accumulo/testing/performance/util/TestData.java +++ b/src/main/java/org/apache/accumulo/testing/performance/util/TestData.java @@ -20,7 +20,7 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.core.util.FastFormat; +import org.apache.accumulo.testing.util.FastFormat; public class TestData { diff --git a/src/main/java/org/apache/accumulo/testing/util/FastFormat.java b/src/main/java/org/apache/accumulo/testing/util/FastFormat.java new file mode 100644 index 00000000..541dc7c6 --- /dev/null +++ b/src/main/java/org/apache/accumulo/testing/util/FastFormat.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ +package org.apache.accumulo.testing.util; + +import static java.nio.charset.StandardCharsets.UTF_8; + +import com.google.common.base.Preconditions; + +public class FastFormat { + // Copied over from accumulo + // this 7 to 8 times faster than String.format("%s%06d",prefix, num) + public static byte[] toZeroPaddedString(long num, int width, int radix, byte[] prefix) { + Preconditions.checkArgument(num >= 0); + String strNum = Long.toString(num, radix); + byte[] ret = new byte[Math.max(strNum.length(), width) + prefix.length]; + if (toZeroPaddedString(ret, 0, strNum, width, prefix) != ret.length) + throw new RuntimeException(" Did not format to expected width " + num + " " + width + " " + + radix + " " + new String(prefix, UTF_8)); + return ret; + } + + public static int toZeroPaddedString(byte[] output, int outputOffset, long num, int width, + int radix, byte[] prefix) { + Preconditions.checkArgument(num >= 0); + + String strNum = Long.toString(num, radix); + + return toZeroPaddedString(output, outputOffset, strNum, width, prefix); + } + + private static int toZeroPaddedString(byte[] output, int outputOffset, String strNum, int width, + byte[] prefix) { + + int index = outputOffset; + + for (byte b : prefix) { + output[index++] = b; + } + + int end = width - strNum.length() + index; + + while (index < end) + output[index++] = '0'; + + for (int i = 0; i < strNum.length(); i++) { + output[index++] = (byte) strNum.charAt(i); + } + + return index - outputOffset; + } +} From 9bcb46f2c97305ce19cc08c59660e25197961894 Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Wed, 8 Sep 2021 15:34:59 -0400 Subject: [PATCH 4/6] Remove traces of Trace --- .../accumulo/testing/ingest/VerifyIngest.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java index b783e8c7..1defb721 100644 --- a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java +++ b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java @@ -32,8 +32,6 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -// import org.apache.accumulo.core.trace.DistributedTrace; -// import org.apache.accumulo.core.trace.Trace; import org.apache.hadoop.io.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,19 +59,7 @@ public static void main(String[] args) throws Exception { Opts opts = new Opts(); opts.parseArgs(VerifyIngest.class.getName(), args); try (AccumuloClient client = Accumulo.newClient().from(opts.getClientProps()).build()) { - if (opts.trace) { - /* - * String name = VerifyIngest.class.getSimpleName(); DistributedTrace.enable(); - * Trace.on(name); Trace.data("cmdLine", Arrays.asList(args).toString()); - */ - } - verifyIngest(client, opts); - - } finally { - /* - * Trace.off(); DistributedTrace.disable(); - */ } } From 96ff1ac384938e8afdd75f2ced773c9acbd5fd16 Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Thu, 9 Sep 2021 15:01:55 -0400 Subject: [PATCH 5/6] Added exception if trace is enabled --- .../java/org/apache/accumulo/testing/ingest/VerifyIngest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java index 1defb721..4196c5fd 100644 --- a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java +++ b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java @@ -59,6 +59,9 @@ public static void main(String[] args) throws Exception { Opts opts = new Opts(); opts.parseArgs(VerifyIngest.class.getName(), args); try (AccumuloClient client = Accumulo.newClient().from(opts.getClientProps()).build()) { + if (opts.trace) { + throw new RuntimeException("Trace is enabled but not currently supported"); + } verifyIngest(client, opts); } } From 02248add41e66b6976925ddc44e9f074a10e547d Mon Sep 17 00:00:00 2001 From: domgarguilo Date: Thu, 9 Sep 2021 15:10:27 -0400 Subject: [PATCH 6/6] revise exception --- .../java/org/apache/accumulo/testing/ingest/VerifyIngest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java index 4196c5fd..d7c36de9 100644 --- a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java +++ b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java @@ -60,7 +60,7 @@ public static void main(String[] args) throws Exception { opts.parseArgs(VerifyIngest.class.getName(), args); try (AccumuloClient client = Accumulo.newClient().from(opts.getClientProps()).build()) { if (opts.trace) { - throw new RuntimeException("Trace is enabled but not currently supported"); + throw new UnsupportedOperationException("Tracing is enabled but not currently supported"); } verifyIngest(client, opts); }