accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [2/3] git commit: ACCUMULO-2560 merge 1.6.1
Date Fri, 08 Aug 2014 18:25:58 GMT
ACCUMULO-2560 merge 1.6.1


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44fc2a64
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44fc2a64
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44fc2a64

Branch: refs/heads/master
Commit: 44fc2a646549eb6f020fce6212cff294dc30b27f
Parents: ab6871e 6023dba
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Aug 8 12:03:53 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Fri Aug 8 12:03:53 2014 -0400

----------------------------------------------------------------------
 .../server/fs/VolumeManagerImplTest.java        |  1 -
 .../accumulo/gc/SimpleGarbageCollector.java     | 65 ++++++++------------
 .../accumulo/gc/SimpleGarbageCollectorTest.java | 16 +++--
 3 files changed, 36 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/44fc2a64/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
----------------------------------------------------------------------
diff --cc server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
index 5f97bf6,5f97bf6..757405a
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java
@@@ -19,7 -19,7 +19,6 @@@ package org.apache.accumulo.server.fs
  import java.util.Arrays;
  import java.util.List;
  
--import org.apache.accumulo.core.conf.AccumuloConfiguration;
  import org.apache.accumulo.core.conf.ConfigurationCopy;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.server.fs.VolumeManager.FileType;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/44fc2a64/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 2466635,64db1db..120a078
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -145,13 -137,11 +144,11 @@@ public class SimpleGarbageCollector imp
    private Instance instance;
  
    public static void main(String[] args) throws UnknownHostException, IOException {
 -    SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
 +    SecurityUtil.serverLogin(SiteConfiguration.getInstance());
      Instance instance = HdfsZooInstance.getInstance();
-     ServerConfigurationFactory serverConf = new ServerConfigurationFactory(instance);
 -    ServerConfiguration conf = new ServerConfiguration(instance);
++    ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
      final VolumeManager fs = VolumeManagerImpl.get();
-     Accumulo.init(fs, serverConf, "gc");
+     Accumulo.init(fs, conf, "gc");
      Opts opts = new Opts();
      opts.parseArgs("gc", args);
      SimpleGarbageCollector gc = new SimpleGarbageCollector(opts);
@@@ -699,8 -635,8 +682,8 @@@
      HostAndPort result = HostAndPort.fromParts(opts.getAddress(), port);
      log.debug("Starting garbage collector listening on " + result);
      try {
-       return TServerUtils.startTServer(result, processor, this.getClass().getSimpleName(),
"GC Monitor Service", 2,
-           conf.getCount(Property.GENERAL_SIMPLETIMER_THREADPOOL_SIZE), 1000, maxMessageSize,
SslConnectionParams.forServer(conf), 0).address;
 -      return TServerUtils.startTServer(result, processor, this.getClass().getSimpleName(),
"GC Monitor Service", 2, 1000, maxMessageSize,
 -          SslConnectionParams.forServer(config), 0).address;
++      return TServerUtils.startTServer(result, processor, this.getClass().getSimpleName(),
"GC Monitor Service", 2, 
++          config.getCount(Property.GENERAL_SIMPLETIMER_THREADPOOL_SIZE), 1000, maxMessageSize,
SslConnectionParams.forServer(config), 0).address;
      } catch (Exception ex) {
        log.fatal(ex, ex);
        throw new RuntimeException(ex);


Mime
View raw message