Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF07E90D8 for ; Fri, 3 Feb 2012 01:48:04 +0000 (UTC) Received: (qmail 38101 invoked by uid 500); 3 Feb 2012 01:48:04 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 37989 invoked by uid 500); 3 Feb 2012 01:48:03 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 37982 invoked by uid 99); 3 Feb 2012 01:48:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 01:48:03 +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; Fri, 03 Feb 2012 01:48:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 436B323888E4 for ; Fri, 3 Feb 2012 01:47:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239973 - in /hadoop/common/branches/branch-1.0: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Date: Fri, 03 Feb 2012 01:47:42 -0000 To: common-commits@hadoop.apache.org From: jitendra@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203014742.436B323888E4@eris.apache.org> Author: jitendra Date: Fri Feb 3 01:47:41 2012 New Revision: 1239973 URL: http://svn.apache.org/viewvc?rev=1239973&view=rev Log: Merged 1239959 from branch-1 for HDFS-2814. Modified: hadoop/common/branches/branch-1.0/CHANGES.txt hadoop/common/branches/branch-1.0/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Modified: hadoop/common/branches/branch-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1239973&r1=1239972&r2=1239973&view=diff ============================================================================== --- hadoop/common/branches/branch-1.0/CHANGES.txt (original) +++ hadoop/common/branches/branch-1.0/CHANGES.txt Fri Feb 3 01:47:41 2012 @@ -13,6 +13,9 @@ Release 1.0.1 - 2012.01.30 HADOOP-7988. Upper case in hostname part of the principals doesn't work with kerberos. (jitendra) + HDFS-2814. NamenodeMXBean does not account for svn revision in the version + information. (Hitesh Shah via jitendra) + BUG FIXES HADOOP-7960. Port HADOOP-5203 to branch-1, build version comparison is too Modified: hadoop/common/branches/branch-1.0/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1239973&r1=1239972&r2=1239973&view=diff ============================================================================== --- hadoop/common/branches/branch-1.0/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original) +++ hadoop/common/branches/branch-1.0/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Feb 3 01:47:41 2012 @@ -5676,7 +5676,7 @@ public class FSNamesystem implements FSC @Override // NameNodeMXBean public String getVersion() { - return VersionInfo.getVersion(); + return VersionInfo.getVersion() + ", r" + VersionInfo.getRevision(); } @Override // NameNodeMXBean Modified: hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java?rev=1239973&r1=1239972&r2=1239973&view=diff ============================================================================== --- hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java (original) +++ hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Fri Feb 3 01:47:41 2012 @@ -25,6 +25,7 @@ import javax.management.ObjectName; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; +import org.apache.hadoop.util.VersionInfo; import org.junit.Test; import junit.framework.Assert; @@ -53,6 +54,8 @@ public class TestNameNodeMXBean { // get attribute "Version" String version = (String) mbs.getAttribute(mxbeanName, "Version"); Assert.assertEquals(fsn.getVersion(), version); + Assert.assertTrue(version.equals(VersionInfo.getVersion() + + ", r" + VersionInfo.getRevision())); // get attribute "Used" Long used = (Long) mbs.getAttribute(mxbeanName, "Used"); Assert.assertEquals(fsn.getUsed(), used.longValue());