Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C2437200B4D for ; Sat, 23 Jul 2016 11:46:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C0B15160A74; Sat, 23 Jul 2016 09:46:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 12926160A67 for ; Sat, 23 Jul 2016 11:46:22 +0200 (CEST) Received: (qmail 11824 invoked by uid 500); 23 Jul 2016 09:46:22 -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 11815 invoked by uid 99); 23 Jul 2016 09:46:22 -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; Sat, 23 Jul 2016 09:46:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CF182E7E18; Sat, 23 Jul 2016 09:46:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10651. Clean up some configuration related codes about legacy block reader. Contributed by Youwei Wang Date: Sat, 23 Jul 2016 09:46:21 +0000 (UTC) archived-at: Sat, 23 Jul 2016 09:46:23 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 22a9a6b0d -> b79ba4fe9 HDFS-10651. Clean up some configuration related codes about legacy block reader. Contributed by Youwei Wang Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b79ba4fe Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b79ba4fe Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b79ba4fe Branch: refs/heads/trunk Commit: b79ba4fe9673a86040277926a669281a92966af4 Parents: 22a9a6b Author: Kai Zheng Authored: Sat Jul 23 17:45:33 2016 +0800 Committer: Kai Zheng Committed: Sat Jul 23 17:45:33 2016 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java | 3 --- .../src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java | 6 ------ .../hadoop-hdfs/src/main/resources/hdfs-default.xml | 9 --------- .../java/org/apache/hadoop/hdfs/TestDFSInputStream.java | 1 - 4 files changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ba4fe/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java index a6e2452..3ea42c3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsClientConfigKeys.java @@ -97,9 +97,6 @@ public interface HdfsClientConfigKeys { int DFS_CLIENT_CACHED_CONN_RETRY_DEFAULT = 3; String DFS_CLIENT_CONTEXT = "dfs.client.context"; String DFS_CLIENT_CONTEXT_DEFAULT = "default"; - String DFS_CLIENT_USE_LEGACY_BLOCKREADER = - "dfs.client.use.legacy.blockreader"; - boolean DFS_CLIENT_USE_LEGACY_BLOCKREADER_DEFAULT = false; String DFS_CLIENT_USE_LEGACY_BLOCKREADERLOCAL = "dfs.client.use.legacy.blockreader.local"; boolean DFS_CLIENT_USE_LEGACY_BLOCKREADERLOCAL_DEFAULT = false; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ba4fe/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java index 40711a7..cfcfd55 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java @@ -1275,12 +1275,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys { HdfsClientConfigKeys.DFS_CLIENT_MAX_BLOCK_ACQUIRE_FAILURES_DEFAULT; @Deprecated - public static final String DFS_CLIENT_USE_LEGACY_BLOCKREADER = - HdfsClientConfigKeys.DFS_CLIENT_USE_LEGACY_BLOCKREADER; - @Deprecated - public static final boolean DFS_CLIENT_USE_LEGACY_BLOCKREADER_DEFAULT = - HdfsClientConfigKeys.DFS_CLIENT_USE_LEGACY_BLOCKREADER_DEFAULT; - @Deprecated public static final String DFS_CLIENT_USE_LEGACY_BLOCKREADERLOCAL = HdfsClientConfigKeys.DFS_CLIENT_USE_LEGACY_BLOCKREADERLOCAL; @Deprecated http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ba4fe/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml index 698a0cc..54592ab 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml @@ -3377,15 +3377,6 @@ - dfs.client.use.legacy.blockreader - false - - If true, use the RemoteBlockReader class for local read short circuit. If false, use - the newer RemoteBlockReader2 class. - - - - dfs.client.write.byte-array-manager.count-limit 2048 http://git-wip-us.apache.org/repos/asf/hadoop/blob/b79ba4fe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInputStream.java index 9d88384..2012258 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInputStream.java @@ -73,7 +73,6 @@ public class TestDFSInputStream { @Test(timeout=60000) public void testSkipWithRemoteBlockReader() throws IOException { Configuration conf = new Configuration(); - conf.setBoolean(HdfsClientConfigKeys.DFS_CLIENT_USE_LEGACY_BLOCKREADER, true); MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build(); try { testSkipInner(cluster); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org