From commits-return-21521-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Feb 23 02:02:24 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5E50318064E for ; Fri, 23 Feb 2018 02:02:24 +0100 (CET) Received: (qmail 83794 invoked by uid 500); 23 Feb 2018 01:02:23 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 83785 invoked by uid 99); 23 Feb 2018 01:02:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Feb 2018 01:02:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id CF9BD85DA0; Fri, 23 Feb 2018 01:02:20 +0000 (UTC) Date: Fri, 23 Feb 2018 01:02:22 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.8' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org In-Reply-To: <151934774051.27416.17658511878547874208@gitbox.apache.org> References: <151934774051.27416.17658511878547874208@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 9619125b747e82a1e5a20450c62395d7f5e0c153 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180223010220.CF9BD85DA0@gitbox.apache.org> 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 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 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> 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 processor = new Processor(tch); + ThriftClientHandler tch = new ThriftClientHandler(new AccumuloServerContext(inst, new ServerConfigurationFactory(inst)), watcher); + Processor 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.