From d7f0af0b65fc57d10a2a36ded9944d2deb74359f Mon Sep 17 00:00:00 2001 From: Xiao Chen Date: Mon, 7 May 2018 12:40:35 -0700 Subject: [PATCH] Revert "HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445." This reverts commit 2444d70a40e2d264cff03f80b1bf59a72318c510. --- .../test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 3 --- 1 file changed, 3 deletions(-) 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 64f0864d0d1..c10d331e53a 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 @@ -110,7 +110,6 @@ 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; @@ -192,8 +191,6 @@ public void setup() throws Exception { // 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);