accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/5] accumulo git commit: Merge branch '1.6'
Date Fri, 19 Dec 2014 06:37:29 GMT
Merge branch '1.6'


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

Branch: refs/heads/master
Commit: 4e83745627c38842935305fb177f85cbec327de8
Parents: 48a857e 59238d0
Author: Josh Elser <elserj@apache.org>
Authored: Fri Dec 19 01:33:42 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Dec 19 01:33:42 2014 -0500

----------------------------------------------------------------------
 .../accumulo/master/TabletGroupWatcher.java     | 28 ++++++++++++++++++--
 .../test/functional/MetadataMaxFilesIT.java     |  2 ++
 2 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e837456/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e837456/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
index b2adc89,b0da8b6..ed08cad
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java
@@@ -36,24 -32,31 +36,26 @@@ import org.apache.accumulo.core.master.
  import org.apache.accumulo.core.metadata.MetadataTable;
  import org.apache.accumulo.core.metadata.RootTable;
  import org.apache.accumulo.core.security.Credentials;
 +import org.apache.accumulo.core.trace.Tracer;
  import org.apache.accumulo.core.util.UtilWaitThread;
 -import org.apache.accumulo.harness.AccumuloClusterIT;
  import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 -import org.apache.accumulo.trace.instrument.Tracer;
 +import org.apache.accumulo.server.util.Admin;
  import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.fs.RawLocalFileSystem;
  import org.apache.hadoop.io.Text;
 -import org.junit.After;
 -import org.junit.Before;
  import org.junit.Test;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
 -
 -public class MetadataMaxFilesIT extends AccumuloClusterIT {
 -  private static final Logger log = LoggerFactory.getLogger(MetadataMaxFilesIT.class);
  
 +public class MetadataMaxFilesIT extends ConfigurableMacIT {
 +  
    @Override
 -  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite)
{
 +  public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
      Map<String,String> siteConfig = new HashMap<String,String>();
      siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
      siteConfig.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), "10");
      cfg.setSiteConfig(siteConfig);
+     hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
    }
 -
 +  
    @Override
    protected int defaultTimeoutSeconds() {
      return 4 * 60;


Mime
View raw message