Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 286549EA6 for ; Sun, 20 Nov 2011 20:59:45 +0000 (UTC) Received: (qmail 45826 invoked by uid 500); 20 Nov 2011 20:59:45 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 45774 invoked by uid 500); 20 Nov 2011 20:59:44 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Delivered-To: moderator for hdfs-commits@hadoop.apache.org Received: (qmail 12627 invoked by uid 99); 20 Nov 2011 15:18:35 -0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204177 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Date: Sun, 20 Nov 2011 15:18:14 -0000 To: hdfs-commits@hadoop.apache.org From: harsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111120151814.AF1052388847@eris.apache.org> Author: harsh Date: Sun Nov 20 15:18:14 2011 New Revision: 1204177 URL: http://svn.apache.org/viewvc?rev=1204177&view=rev Log: HDFS-2572. Remove Unnecessary double-check in DN#getHostName (harsh) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1204177&r1=1204176&r2=1204177&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sun Nov 20 15:18:14 2011 @@ -55,6 +55,8 @@ Trunk (unreleased changes) HDFS-2564. Cleanup unnecessary exceptions thrown and unnecessary casts. (Hari Mankude via eli) + HDFS-2572. Remove unnecessary double-check in DN#getHostName. (harsh) + OPTIMIZATIONS HDFS-2477. Optimize computing the diff between a block report and the namenode state. (Tomasz Nykiel via hairong) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1204177&r1=1204176&r2=1204177&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Sun Nov 20 15:18:14 2011 @@ -454,11 +454,8 @@ public class DataNode extends Configured private static String getHostName(Configuration config) throws UnknownHostException { - String name = null; // use configured nameserver & interface to get local hostname - if (config.get(DFS_DATANODE_HOST_NAME_KEY) != null) { - name = config.get(DFS_DATANODE_HOST_NAME_KEY); - } + String name = config.get(DFS_DATANODE_HOST_NAME_KEY); if (name == null) { name = DNS .getDefaultHost(config.get(DFS_DATANODE_DNS_INTERFACE_KEY,