You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2019/03/18 14:55:37 UTC
[accumulo-testing] branch master updated: Update Accumulo version
to 2.0.0-SNAPSHOT (#66)
This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 210b30f Update Accumulo version to 2.0.0-SNAPSHOT (#66)
210b30f is described below
commit 210b30f14d15c0002400f630e7b7997a7cd33e30
Author: Mike Walch <mw...@apache.org>
AuthorDate: Mon Mar 18 10:55:32 2019 -0400
Update Accumulo version to 2.0.0-SNAPSHOT (#66)
---
pom.xml | 2 +-
.../accumulo/testing/continuous/ContinuousIngest.java | 6 +++---
.../accumulo/testing/continuous/ContinuousWalk.java | 8 ++++----
.../apache/accumulo/testing/ingest/VerifyIngest.java | 17 +++++++++--------
.../testing/randomwalk/ReplicationRandomWalkIT.java | 5 ++++-
5 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8ec588a..020ba7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Accumulo Testing</name>
<description>Testing tools for Apache Accumulo</description>
<properties>
- <accumulo.version>2.0.0-alpha-2</accumulo.version>
+ <accumulo.version>2.0.0-SNAPSHOT</accumulo.version>
<eclipseFormatterStyle>${project.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<hadoop.version>3.1.1</hadoop.version>
<maven.compiler.source>1.8</maven.compiler.source>
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 85ce6c3..a65e46f 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousIngest.java
@@ -34,8 +34,8 @@ import org.apache.accumulo.core.client.MutationsRejectedException;
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.trace.Trace;
-import org.apache.accumulo.core.trace.TraceSamplers;
+// import org.apache.accumulo.core.trace.Trace;
+// import org.apache.accumulo.core.trace.TraceSamplers;
import org.apache.accumulo.core.util.FastFormat;
import org.apache.accumulo.testing.TestProps;
import org.slf4j.Logger;
@@ -128,7 +128,7 @@ public class ContinuousIngest {
}
BatchWriter bw = client.createBatchWriter(tableName);
- bw = Trace.wrapAll(bw, TraceSamplers.countSampler(1024));
+ // bw = Trace.wrapAll(bw, TraceSamplers.countSampler(1024));
Random r = new Random();
diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousWalk.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousWalk.java
index 2094ec9..6cc0e9c 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousWalk.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousWalk.java
@@ -28,8 +28,8 @@ import org.apache.accumulo.core.client.Scanner;
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.trace.Span;
-import org.apache.accumulo.core.trace.Trace;
+// import org.apache.accumulo.core.trace.Span;
+// import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.testing.TestProps;
import org.apache.hadoop.io.Text;
@@ -66,7 +66,7 @@ public class ContinuousWalk {
values.clear();
long t1 = System.currentTimeMillis();
- Span span = Trace.on("walk");
+ // Span span = Trace.on("walk");
try {
scanner.setRange(new Range(new Text(row)));
for (Entry<Key,Value> entry : scanner) {
@@ -74,7 +74,7 @@ public class ContinuousWalk {
values.add(entry.getValue());
}
} finally {
- span.stop();
+ // span.stop();
}
long t2 = System.currentTimeMillis();
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 c403beb..dd9aa18 100644
--- a/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java
+++ b/src/main/java/org/apache/accumulo/testing/ingest/VerifyIngest.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.testing.ingest;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Random;
@@ -33,8 +32,8 @@ import org.apache.accumulo.core.data.PartialKey;
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.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;
@@ -64,16 +63,18 @@ public class VerifyIngest {
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());
+ /*
+ * DistributedTrace.enable(); Trace.on(name); Trace.data("cmdLine",
+ * Arrays.asList(args).toString());
+ */
}
verifyIngest(client, opts);
} finally {
- Trace.off();
- DistributedTrace.disable();
+ /*
+ * Trace.off(); DistributedTrace.disable();
+ */
}
}
diff --git a/src/test/java/org/apache/accumulo/testing/randomwalk/ReplicationRandomWalkIT.java b/src/test/java/org/apache/accumulo/testing/randomwalk/ReplicationRandomWalkIT.java
index 793ffaa..6271fd4 100644
--- a/src/test/java/org/apache/accumulo/testing/randomwalk/ReplicationRandomWalkIT.java
+++ b/src/test/java/org/apache/accumulo/testing/randomwalk/ReplicationRandomWalkIT.java
@@ -19,6 +19,8 @@ package org.apache.accumulo.testing.randomwalk;
import static org.apache.accumulo.core.conf.Property.TSERV_NATIVEMAP_ENABLED;
import static org.apache.accumulo.core.conf.Property.TSERV_WALOG_MAX_SIZE;
+import org.apache.accumulo.core.client.Accumulo;
+import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
import org.apache.accumulo.testing.randomwalk.concurrent.Replication;
@@ -42,7 +44,8 @@ public class ReplicationRandomWalkIT extends ConfigurableMacBase {
RandWalkEnv env = EasyMock.createMock(RandWalkEnv.class);
EasyMock.expect(env.getAccumuloUserName()).andReturn("root").anyTimes();
EasyMock.expect(env.getAccumuloPassword()).andReturn(ROOT_PASSWORD).anyTimes();
- EasyMock.expect(env.getAccumuloClient()).andReturn(this.createClient()).anyTimes();
+ AccumuloClient client = Accumulo.newClient().from(this.getClientProperties()).build();
+ EasyMock.expect(env.getAccumuloClient()).andReturn(client).anyTimes();
EasyMock.replay(env);
r.visit(null, env, null);