Repository: accumulo Updated Branches: refs/heads/master e9573bf3b -> 41b792da3
ACCUMULO-4674 Enable Native map before configure Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41b792da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41b792da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41b792da Branch: refs/heads/master Commit: 41b792da3b5168e629af65b96c24da24e292f366 Parents: e9573bf Author: Mike Miller <mmil...@apache.org> Authored: Thu Jul 6 12:06:38 2017 -0400 Committer: Mike Miller <mmil...@apache.org> Committed: Thu Jul 6 12:22:11 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/functional/ConfigurableMacBase.java | 1 + .../java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/41b792da/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java index ecc3202..64d3503 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java @@ -136,6 +136,7 @@ public class ConfigurableMacBase extends AccumuloITBase { cfg.setNativeLibPaths(nativePathInDevTree, nativePathInMapReduce); cfg.setProperty(Property.GC_FILE_ARCHIVE, Boolean.TRUE.toString()); Configuration coreSite = new Configuration(false); + cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.TRUE.toString()); configure(cfg, coreSite); configureForEnvironment(cfg, getClass(), getSslDir(baseDir)); cluster = new MiniAccumuloClusterImpl(cfg); http://git-wip-us.apache.org/repos/asf/accumulo/blob/41b792da/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java index 76a8c5d..ee7e891 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java @@ -52,6 +52,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase { cfg.setNumTservers(1); cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s"); cfg.setProperty(Property.GENERAL_RPC_TIMEOUT, "5s"); + cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.FALSE.toString()); cfg.useMiniDFS(true); }
