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

[jitendra]

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());