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

This reverts commit 9f19c3b03eac43e549a33e5c8e92c7a39432d736.
This commit is contained in:
Xiao Chen 2018-05-04 20:19:34 -07:00
parent a0b7abf278
commit 22384580b2

View File

@ -108,7 +108,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;
@ -190,8 +189,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);