From d762932d793a84d0a0f4e7c9cc70da9c7f55572f Mon Sep 17 00:00:00 2001 From: Xiao Chen Date: Mon, 7 May 2018 13:33:38 -0700 Subject: [PATCH] Revert "HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445." This reverts commit 128b09ee4392428467c1bcd7cf9c08fadf4ba2b5. --- .../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 51c6c4e771e..6f9ef290a76 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.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; @@ -193,8 +192,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);