accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Fri, 23 Feb 2018 01:02:22 GMT
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 9619125b747e82a1e5a20450c62395d7f5e0c153
Merge: b820368 eb8ea99
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Thu Feb 22 20:01:22 2018 -0500

    Merge branch '1.8'

 .../apache/accumulo/test/functional/ZombieTServer.java    |  2 +-
 .../test/performance/{thrift => }/NullTserver.java        | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index af8afd4,c2b6a27..8784fd4
--- a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@@ -28,13 -28,10 +28,12 @@@ import java.util.concurrent.TimeUnit
  
  import org.apache.accumulo.core.cli.Help;
  import org.apache.accumulo.core.client.ClientConfiguration;
 +import org.apache.accumulo.core.client.Instance;
  import org.apache.accumulo.core.client.ZooKeeperInstance;
 +import org.apache.accumulo.core.client.impl.Table;
  import org.apache.accumulo.core.client.impl.Tables;
--import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
  import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
  import org.apache.accumulo.core.conf.DefaultConfiguration;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Range;
@@@ -49,7 -46,7 +48,6 @@@ import org.apache.accumulo.core.data.th
  import org.apache.accumulo.core.data.thrift.TColumn;
  import org.apache.accumulo.core.data.thrift.TConditionalMutation;
  import org.apache.accumulo.core.data.thrift.TConditionalSession;
--import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
  import org.apache.accumulo.core.data.thrift.TKeyExtent;
  import org.apache.accumulo.core.data.thrift.TMutation;
  import org.apache.accumulo.core.data.thrift.TRange;
@@@ -242,29 -235,6 +239,29 @@@ public class NullTserver 
  
      @Override
      public void removeLogs(TInfo tinfo, TCredentials credentials, List<String> filenames)
throws TException {}
 +
 +    @Override
-     public TSummaries startGetSummaries(TInfo tinfo, TCredentials credentials, TSummaryRequest
request)
-         throws ThriftSecurityException, ThriftTableOperationException, NoSuchScanIDException,
TException {
++    public TSummaries startGetSummaries(TInfo tinfo, TCredentials credentials, TSummaryRequest
request) throws ThriftSecurityException,
++        ThriftTableOperationException, NoSuchScanIDException, TException {
 +      return null;
 +    }
 +
 +    @Override
 +    public TSummaries startGetSummariesForPartition(TInfo tinfo, TCredentials credentials,
TSummaryRequest request, int modulus, int remainder)
 +        throws ThriftSecurityException, NoSuchScanIDException, TException {
 +      return null;
 +    }
 +
 +    @Override
 +    public TSummaries startGetSummariesFromFiles(TInfo tinfo, TCredentials credentials,
TSummaryRequest request, Map<String,List<TRowRange>> files)
 +        throws ThriftSecurityException, NoSuchScanIDException, TException {
 +      return null;
 +    }
 +
 +    @Override
 +    public TSummaries contiuneGetSummaries(TInfo tinfo, long sessionId) throws NoSuchScanIDException,
TException {
 +      return null;
 +    }
    }
  
    static class Opts extends Help {
@@@ -284,14 -254,13 +281,14 @@@
  
      // modify metadata
      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);
 +    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));
+     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
ctubbsii@apache.org.

Mime
View raw message