From mapreduce-commits-return-2802-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Nov 8 04:49:23 2011 Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-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 B00809364 for ; Tue, 8 Nov 2011 04:49:23 +0000 (UTC) Received: (qmail 58679 invoked by uid 500); 8 Nov 2011 04:49:23 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 58647 invoked by uid 500); 8 Nov 2011 04:49:22 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 58639 invoked by uid 99); 8 Nov 2011 04:49:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 04:49:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 04:49:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DB9B723888FE; Tue, 8 Nov 2011 04:48:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199106 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java Date: Tue, 08 Nov 2011 04:48:57 -0000 To: mapreduce-commits@hadoop.apache.org From: amarrk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111108044857.DB9B723888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amarrk Date: Tue Nov 8 04:48:57 2011 New Revision: 1199106 URL: http://svn.apache.org/viewvc?rev=1199106&view=rev Log: MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null. (amarrk) Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1199106&r1=1199105&r2=1199106&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Nov 8 04:48:57 2011 @@ -15,6 +15,8 @@ Release 0.23.1 - Unreleased OPTIMIZATIONS BUG FIXES + MAPREDUCE-3346 [Rumen] LoggedTaskAttempt#getHostName() returns null. + (amarrk) MAPREDUCE-3221. Reenabled the previously ignored test in TestSubmitJob and fixed bugs in it. (Devaraj K via vinodkv) Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java?rev=1199106&r1=1199105&r2=1199106&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java Tue Nov 8 04:48:57 2011 @@ -328,11 +328,27 @@ public class LoggedTaskAttempt implement return hostName; } - + void setHostName(String hostName) { + this.hostName = hostName; + } + // hostName is saved in the format rackName/NodeName void setHostName(String hostName, String rackName) { - this.hostName = hostName == null || rackName == null ? null - : rackName.intern() + "/" + hostName.intern(); + if (hostName == null || hostName.length() == 0) { + throw new RuntimeException("Invalid entry! Missing hostname"); + } else if (rackName == null || rackName.length() == 0) { + setHostName(hostName); + } else { + // make sure that the rackname is prefixed with a '/' + if (!rackName.startsWith("/")) { + rackName = "/" + rackName; + } + // make sure that the hostname is prefixed with a '/' + if (!hostName.startsWith("/")) { + hostName = "/" + hostName; + } + setHostName(rackName.intern() + hostName.intern()); + } } public long getHdfsBytesRead() {