This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 4d90f21ce37d6eded07faa49309f659e3eafa36a
Merge: c134e65 9ac92c7
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Jan 18 17:58:29 2018 -0500
Merge branch '1.8' into master-drop-commons-config
core/pom.xml | 13 +-
.../org/apache/accumulo/core/cli/ClientOpts.java | 4 +-
.../accumulo/core/client/ClientConfiguration.java | 907 ++++++++++++++++++++-
.../accumulo/core/client/ZooKeeperInstance.java | 23 +-
.../accumulo/core/client/impl/ClientContext.java | 4 +-
.../accumulo/core/rpc/SaslConnectionParams.java | 9 +-
.../core/client/ClientConfigurationTest.java | 5 +-
.../core/client/impl/ClientContextTest.java | 8 +-
.../core/client/impl/TableOperationsImplTest.java | 2 +-
.../core/client/impl/TabletLocatorImplTest.java | 2 +-
.../mapreduce/lib/impl/ConfiguratorBaseTest.java | 2 +-
minicluster/pom.xml | 1 -
.../accumulo/minicluster/MiniAccumuloInstance.java | 7 +-
.../minicluster/impl/MiniAccumuloClusterImpl.java | 10 +-
pom.xml | 2 +-
.../main/java/org/apache/accumulo/proxy/Proxy.java | 2 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 8 +-
.../replication/ReplicationProcessorTest.java | 4 +-
.../org/apache/accumulo/shell/ShellOptionsJC.java | 3 +-
.../org/apache/accumulo/shell/ShellConfigTest.java | 6 +-
.../accumulo/shell/ShellSetInstanceTest.java | 4 +-
.../accumulo/harness/AccumuloClusterHarness.java | 3 +-
.../StandaloneAccumuloClusterConfiguration.java | 9 +-
.../apache/accumulo/test/ConditionalWriterIT.java | 5 +-
.../org/apache/accumulo/test/IMMLGBenchmark.java | 2 +-
.../org/apache/accumulo/test/ShellServerIT.java | 12 +-
.../java/org/apache/accumulo/test/UsersIT.java | 3 +-
.../BalanceInPresenceOfOfflineTableIT.java | 3 +-
.../test/functional/ChaoticBalancerIT.java | 3 +-
.../accumulo/test/functional/CompactionIT.java | 3 +-
.../test/functional/ConfigurableMacBase.java | 2 +-
.../accumulo/test/functional/CredentialsIT.java | 3 +-
.../test/functional/DynamicThreadPoolsIT.java | 3 +-
.../accumulo/test/functional/FateStarvationIT.java | 3 +-
.../accumulo/test/functional/MasterFailoverIT.java | 5 +-
.../apache/accumulo/test/functional/MaxOpenIT.java | 3 +-
.../accumulo/test/functional/PermissionsIT.java | 5 +-
.../accumulo/test/functional/ReadWriteIT.java | 11 +-
.../apache/accumulo/test/functional/RenameIT.java | 5 +-
.../apache/accumulo/test/functional/RestartIT.java | 11 +-
.../accumulo/test/functional/ScanIteratorIT.java | 4 +-
.../apache/accumulo/test/functional/SplitIT.java | 7 +-
.../apache/accumulo/test/functional/TableIT.java | 3 +-
.../accumulo/test/functional/WriteAheadLogIT.java | 3 +-
.../accumulo/test/functional/WriteLotsIT.java | 5 +-
.../test/mapred/AccumuloOutputFormatIT.java | 2 +-
.../metadata/MetadataBatchScanTest.java | 2 +-
.../test/performance/thrift/NullTserver.java | 2 +-
48 files changed, 978 insertions(+), 170 deletions(-)
diff --cc
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 09dd7e5,f465891..af92622
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@@ -95,8 -92,7 +95,6 @@@ import org.apache.accumulo.server.util.
import org.apache.accumulo.server.zookeeper.ZooReaderWriterFactory;
import org.apache.accumulo.start.Main;
import org.apache.accumulo.start.classloader.vfs.MiniDFSUtil;
- import org.apache.commons.configuration.AbstractConfiguration;
- import org.apache.commons.configuration.MapConfiguration;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.impl.VFSClassLoader;
import org.apache.hadoop.conf.Configuration;
diff --cc pom.xml
index db2a0c7,c24862f..dd82739
--- a/pom.xml
+++ b/pom.xml
@@@ -999,12 -797,12 +999,12 @@@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>apilyzer-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.2.0</version>
</plugin>
<plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
+ <groupId>net.revelc.code.formatter</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>2.7.1</version>
<configuration>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
<compilerSource>${maven.compiler.source}</compilerSource>
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 7532b54,ede79dd..e7b94c1
---
a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@@ -23,11 -23,8 +23,10 @@@ import java.util.stream.Stream
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.ClientConfiguration;
- import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.admin.NewTableConfiguration;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.master.balancer.ChaoticLoadBalancer;
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 82f820b,25cc8e4..5712112
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@@ -65,12 -62,9 +65,11 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.ClientConfiguration;
- import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.admin.NewTableConfiguration;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
diff --cc test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
index ccb8116,3574328..f31b5c3
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
@@@ -148,26 -146,25 +147,26 @@@ public class SplitIT extends AccumuloCl
while (c.tableOperations().listSplits(table).size() < 10) {
sleepUninterruptibly(15, TimeUnit.SECONDS);
}
- String id = c.tableOperations().tableIdMap().get(table);
- Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- KeyExtent extent = new KeyExtent(id, null, null);
- s.setRange(extent.toMetadataRange());
- MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(s);
- int count = 0;
- int shortened = 0;
- for (Entry<Key,Value> entry : s) {
- extent = new KeyExtent(entry.getKey().getRow(), entry.getValue());
- if (extent.getEndRow() != null &&
extent.getEndRow().toString().length() < 14)
- shortened++;
- count++;
+ Table.ID id = Table.ID.of(c.tableOperations().tableIdMap().get(table));
+ try (Scanner s = c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY)) {
+ KeyExtent extent = new KeyExtent(id, null, null);
+ s.setRange(extent.toMetadataRange());
+
MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(s);
+ int count = 0;
+ int shortened = 0;
+ for (Entry<Key,Value> entry : s) {
+ extent = new KeyExtent(entry.getKey().getRow(), entry.getValue());
+ if (extent.getEndRow() != null &&
extent.getEndRow().toString().length() < 14)
+ shortened++;
+ count++;
+ }
+
+ assertTrue("Shortened should be greater than zero: " + shortened,
shortened > 0);
+ assertTrue("Count should be cgreater than 10: " + count, count > 10);
}
- assertTrue("Shortened should be greater than zero: " + shortened,
shortened > 0);
- assertTrue("Count should be cgreater than 10: " + count, count > 10);
-
String[] args;
- if
(clientConfig.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey(),
false)) {
+ if (clientConfig.hasSasl()) {
ClusterUser rootUser = getAdminUser();
args = new String[] {"-i", cluster.getInstanceName(), "-u",
rootUser.getPrincipal(), "--keytab", rootUser.getKeytab().getAbsolutePath(),
"-z",
cluster.getZooKeepers()};
diff --cc
test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
index a710f4b,c9da60b..cb9ee98
---
a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++
b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
@@@ -283,15 -253,14 +283,15 @@@ public class NullTserver
opts.parseArgs(NullTserver.class.getName(), args);
// modify metadata
- ZooKeeperInstance zki = new ZooKeeperInstance(new
ClientConfiguration().withInstance(opts.iname).withZkHosts(opts.keepers));
+ ZooKeeperInstance zki = new
ZooKeeperInstance(ClientConfiguration.create().withInstance(opts.iname).withZkHosts(opts.keepers));
- AccumuloServerContext context = new AccumuloServerContext(new
ServerConfigurationFactory(zki));
+ Instance inst = HdfsZooInstance.getInstance();
+ AccumuloServerContext context = new AccumuloServerContext(inst, new
ServerConfigurationFactory(zki));
TransactionWatcher watcher = new TransactionWatcher();
- ThriftClientHandler tch = new ThriftClientHandler(new
AccumuloServerContext(new
ServerConfigurationFactory(HdfsZooInstance.getInstance())), watcher);
- Processor<Iface> processor = new Processor<Iface>(tch);
- TServerUtils.startTServer(context.getConfiguration(),
ThriftServerType.CUSTOM_HS_HA, processor, "NullTServer", "null tserver", 2, 1,
1000,
- 10 * 1024 * 1024, null, null, -1, HostAndPort.fromParts("0.0.0.0",
opts.port));
+ ThriftClientHandler tch = new ThriftClientHandler(new
AccumuloServerContext(inst, new ServerConfigurationFactory(inst)), watcher);
+ Processor<Iface> processor = new Processor<>(tch);
+ TServerUtils.startTServer(context.getConfiguration(),
ThriftServerType.CUSTOM_HS_HA, processor, "NullTServer", "null tserver", 2, 1,
1000, 10 * 1024 * 1024,
+ null, null, -1, HostAndPort.fromParts("0.0.0.0", opts.port));
HostAndPort addr =
HostAndPort.fromParts(InetAddress.getLocalHost().getHostName(), opts.port);
--
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.
