hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject [1/3] hadoop git commit: Revert "HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445."
Date Tue, 08 May 2018 00:33:52 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8.4 c77a6c910 -> d10c4a97e


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

This reverts commit e3a49fe1dd9e95c63a628fbff60b76e7d947d1f9.

(cherry picked from commit 0c59baebbf3292607e7177d9be3a9a18e12bfdf7)


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

Branch: refs/heads/branch-2.8.4
Commit: 2ef1ace2971f67b8b55c7ea82e8a4f5ff1fd917c
Parents: c77a6c9
Author: Xiao Chen <xiao@apache.org>
Authored: Mon May 7 11:10:15 2018 -0700
Committer: Junping Du <junping_du@apache.org>
Committed: Tue May 8 08:29:40 2018 +0800

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ef1ace2/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 1b54205..276cc60 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,7 +108,6 @@ 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;
@@ -187,8 +186,6 @@ 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