HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65035937 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65035937 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65035937 Branch: refs/heads/HDFS-7240 Commit: 650359371175fba416331e73aa03d2a96ccb90e5 Parents: fa8b88a Author: Xiao Chen <x...@apache.org> Authored: Fri Apr 13 09:04:52 2018 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Fri Apr 13 09:05:17 2018 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/65035937/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 6f9ef29..51c6c4e 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,6 +110,7 @@ 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; @@ -192,6 +193,8 @@ 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
