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

This reverts commit 2444d70a40e2d264cff03f80b1bf59a72318c510.
This commit is contained in:
Xiao Chen 2018-05-07 12:40:35 -07:00
parent 312462532e
commit d7f0af0b65

View File

@ -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);