From commits-return-21367-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Jan 17 19:20:06 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 70D5018066D for ; Wed, 17 Jan 2018 19:20:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 60CC0160C25; Wed, 17 Jan 2018 18:20:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AC8A4160C35 for ; Wed, 17 Jan 2018 19:20:05 +0100 (CET) Received: (qmail 37674 invoked by uid 500); 17 Jan 2018 18:20:04 -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 37625 invoked by uid 99); 17 Jan 2018 18:20:04 -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; Wed, 17 Jan 2018 18:20:04 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 25FDF820BD; Wed, 17 Jan 2018 18:20:03 +0000 (UTC) Date: Wed, 17 Jan 2018 18:20:03 +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: kturner@apache.org In-Reply-To: <151621320263.14786.2272896310912167215@gitbox.apache.org> References: <151621320263.14786.2272896310912167215@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: 35e76d427abc01e91c503877197e2011f5302d55 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180117182003.25FDF820BD@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 35e76d427abc01e91c503877197e2011f5302d55 Merge: a770d44 53c3077 Author: Keith Turner AuthorDate: Wed Jan 17 13:18:49 2018 -0500 Merge branch '1.8' .../core/iterators/user/ColumnAgeOffFilter.java | 6 +- .../java/org/apache/accumulo/master/Master.java | 8 +- .../apache/accumulo/tserver/TabletMutations.java | 6 +- .../org/apache/accumulo/tserver/TabletServer.java | 34 +++--- .../org/apache/accumulo/tserver/log/DfsLogger.java | 8 +- .../accumulo/tserver/log/TabletServerLogger.java | 6 +- .../accumulo/tserver/tablet/CommitSession.java | 6 +- .../accumulo/tserver/tablet/TabletMemory.java | 2 +- .../main/java/org/apache/accumulo/shell/Shell.java | 18 ++-- .../shell/commands/SetIterCommandTest.java | 120 +++++++++++++++++++++ .../start/classloader/vfs/ContextManager.java | 35 +++--- 11 files changed, 184 insertions(+), 65 deletions(-) diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java index 441a265,7b0b073..19dbd93 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@@ -603,23 -596,24 +603,23 @@@ public class Master extends AccumuloSer this.fs = fs; this.hostname = hostname; - AccumuloConfiguration aconf = serverConfig.getConfiguration(); + AccumuloConfiguration aconf = serverConfig.getSystemConfiguration(); - log.info("Version " + Constants.VERSION); - log.info("Instance " + getInstance().getInstanceID()); + log.info("Version {}", Constants.VERSION); + log.info("Instance {}", getInstance().getInstanceID()); timeKeeper = new MasterTime(this); - ThriftTransportPool.getInstance().setIdleTime(aconf.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT)); tserverSet = new LiveTServerSet(this, this); - this.tabletBalancer = aconf.instantiateClassProperty(Property.MASTER_TABLET_BALANCER, TabletBalancer.class, new DefaultLoadBalancer()); - this.tabletBalancer.init(serverConfig); + this.tabletBalancer = Property.createInstanceFromPropertyName(aconf, Property.MASTER_TABLET_BALANCER, TabletBalancer.class, new DefaultLoadBalancer()); + this.tabletBalancer.init(this); try { - AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig(new Iterable>() { + AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig() { @Override - public Iterator> iterator() { - return getConfiguration().iterator(); + public String getProperty(String key) { + return getConfiguration().get(key); } - })); + }); } catch (IOException e) { throw new RuntimeException(e); } diff --cc start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java index ffb7dc1,a3d51fc..a1e1e0b --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java @@@ -18,9 -18,7 +18,8 @@@ package org.apache.accumulo.start.class import java.io.IOException; import java.util.HashMap; - import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.apache.commons.vfs2.FileSystemException; -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" .