From common-commits-return-82424-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Mon May 7 22:35:40 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 72A51180648 for ; Mon, 7 May 2018 22:35:40 +0200 (CEST) Received: (qmail 48465 invoked by uid 500); 7 May 2018 20:35:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 47774 invoked by uid 99); 7 May 2018 20:35:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2018 20:35:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41DD4F6C37; Mon, 7 May 2018 20:35:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xyao@apache.org To: common-commits@hadoop.apache.org Date: Mon, 07 May 2018 20:35:58 -0000 Message-Id: <47c46f0c2d854eadaf2e66c9edd36e57@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/35] hadoop git commit: Revert "HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445." Revert "HDFS-13430. Fix TestEncryptionZonesWithKMS failure due to HADOOP-14445." This reverts commit 650359371175fba416331e73aa03d2a96ccb90e5. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/118bd758 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/118bd758 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/118bd758 Branch: refs/heads/HDDS-4 Commit: 118bd7580583e31bf643b642a2fbc9556177b906 Parents: 5b11b9f Author: Xiao Chen Authored: Fri May 4 20:19:34 2018 -0700 Committer: Xiao Chen Committed: Mon May 7 13:32:27 2018 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/118bd758/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 51c6c4e..6f9ef29 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); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org