hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shahr...@apache.org
Subject hadoop git commit: HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445.
Date Thu, 19 Apr 2018 03:54:05 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 4c38f4998 -> 4c725f446


HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445.

(cherry picked from commit 650359371175fba416331e73aa03d2a96ccb90e5)


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

Branch: refs/heads/branch-2.9
Commit: 4c725f44674e144ce2bc03320b06fa3c08422284
Parents: 4c38f49
Author: Xiao Chen <xiao@apache.org>
Authored: Fri Apr 13 09:04:52 2018 -0700
Committer: Rushabh Shah <shahrs87@apache.org>
Committed: Wed Apr 18 22:48:21 2018 -0500

----------------------------------------------------------------------
 .../src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c725f44/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
index d3dc110..8a4d98e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
@@ -108,6 +108,7 @@ import org.junit.Test;
 import org.junit.rules.Timeout;
 import org.mockito.Mockito;
 
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.KMS_CLIENT_COPY_LEGACY_TOKEN_KEY;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyLong;
@@ -186,6 +187,8 @@ public class TestEncryptionZones {
     // Lower the batch size for testing
     conf.setInt(DFSConfigKeys.DFS_NAMENODE_LIST_ENCRYPTION_ZONES_NUM_RESPONSES,
         2);
+    // disable kms client copy legacy token logic because it's irrelevant.
+    conf.setBoolean(KMS_CLIENT_COPY_LEGACY_TOKEN_KEY, false);
     cluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
     cluster.waitActive();
     Logger.getLogger(EncryptionZoneManager.class).setLevel(Level.TRACE);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message