accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject accumulo git commit: ACCUMULO-4674 Fixed ExistingMacIT
Date Wed, 05 Jul 2017 20:50:46 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 2a92a1d40 -> 4cffe0290


ACCUMULO-4674 Fixed ExistingMacIT


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

Branch: refs/heads/master
Commit: 4cffe02905527954a031b0994f68bce6faf670f5
Parents: 2a92a1d
Author: Mike Miller <mmiller@apache.org>
Authored: Wed Jul 5 16:38:37 2017 -0400
Committer: Mike Miller <mmiller@apache.org>
Committed: Wed Jul 5 16:49:35 2017 -0400

----------------------------------------------------------------------
 test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java   | 4 ++++
 .../org/apache/accumulo/test/functional/ConfigurableMacBase.java | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cffe029/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
index ff8a6ac..90fb828 100644
--- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java
@@ -64,6 +64,10 @@ public class ExistingMacIT extends ConfigurableMacBase {
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
+    // NativeMap.java was changed to fail if native lib missing in ACCUMULO-4596
+    // testExistingInstance will fail because the native path is not set in MiniAccumuloConfigImpl.useExistingInstance
+    // so disable Native maps for this test
+    cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, "false");
 
     // use raw local file system so walogs sync and flush will work
     hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cffe029/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 cce906f..ecc3202 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
@@ -137,7 +137,6 @@ public class ConfigurableMacBase extends AccumuloITBase {
     cfg.setProperty(Property.GC_FILE_ARCHIVE, Boolean.TRUE.toString());
     Configuration coreSite = new Configuration(false);
     configure(cfg, coreSite);
-    cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.TRUE.toString());
     configureForEnvironment(cfg, getClass(), getSslDir(baseDir));
     cluster = new MiniAccumuloClusterImpl(cfg);
     if (coreSite.size() > 0) {


Mime
View raw message