[GitHub] ctubbsii closed pull request #895: Fix SslIT integration tests

[GitBox <gi...@apache.org>]

ctubbsii closed pull request #895: Fix SslIT integration tests
URL: https://github.com/apache/accumulo/pull/895
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/MapReduceIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/MapReduceIT.java
index 33b13c252a..8f8ff44ae7 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/MapReduceIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/MapReduceIT.java
@@ -18,7 +18,10 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
@@ -87,10 +90,15 @@ public static void runTest(AccumuloClient c, MiniAccumuloClusterImpl cluster)
       bw.addMutation(m);
     }
     bw.close();
+    String filename = MapReduceIT.class.getName() + "-client.properties";
+    File configFile = Paths.get(System.getProperty("user.dir"), "target", filename).toFile();
+    try (PrintStream out = new PrintStream(configFile)) {
+      c.properties().store(out, "Config file for " + MapReduceIT.class.getName());
+    }
     ClientInfo info = ClientInfo.from(c.properties());
     Process hash = cluster.exec(RowHash.class, Collections.singletonList(hadoopTmpDirArg), "-i",
         info.getInstanceName(), "-z", info.getZooKeepers(), "-u", "root", "-p", ROOT_PASSWORD, "-t",
-        tablename, "--column", input_cfcq);
+        tablename, "--column", input_cfcq, "--config-file", configFile.getAbsolutePath());
     assertEquals(0, hash.waitFor());
 
     try (Scanner s = c.createScanner(tablename, Authorizations.EMPTY)) {
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/RowHash.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/RowHash.java
index ea0b14665d..6282f7acca 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/RowHash.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/RowHash.java
@@ -27,6 +27,7 @@
 import org.apache.accumulo.core.client.admin.DelegationTokenConfig;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.KerberosToken;
+import org.apache.accumulo.core.clientImpl.ClientConfConverter;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
@@ -82,10 +83,13 @@ public String getTableName() {
     }
 
     public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
+      org.apache.accumulo.core.client.ClientConfiguration clientConf = ClientConfConverter
+          .toClientConf(this.getClientProperties());
       org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat.setZooKeeperInstance(job,
-          this.instance, this.zookeepers);
+          clientConf);
+
       org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat.setZooKeeperInstance(job,
-          this.instance, this.zookeepers);
+          clientConf);
 
       final String principal = getPrincipal();
       getTableName();
diff --git a/test/src/main/resources/log4j.properties b/test/src/main/resources/log4j.properties
index 0ba2ff9721..e50fd356ad 100644
--- a/test/src/main/resources/log4j.properties
+++ b/test/src/main/resources/log4j.properties
@@ -55,3 +55,5 @@ log4j.logger.org.apache.accumulo.server.thrift.UGIAssumingProcessor=TRACE
 log4j.logger.org.apache.hadoop.security.UserGroupInformation=INFO
 # For debugging replication tests.
 log4j.logger.org.apache.accumulo.master.MasterDrainImpl=TRACE
+# This is spammy
+log4j.logger.org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl=INFO


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services