accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Wed, 17 Jan 2018 18:20:03 GMT
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 <kturner@apache.org>
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<Entry<String,String>>() {
+       AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig()
{
          @Override
-         public Iterator<Entry<String,String>> 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" <commits@accumulo.apache.org>.

Mime
View raw message