Author: jitendra Date: Fri Feb 3 00:49:05 2012 New Revision: 1239959 URL: http://svn.apache.org/viewvc?rev=1239959&view=rev Log: HDFS-2814. NamenodeMXBean does not account for svn revision in the version information. Contributed by Hitesh Shah.
Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1239959&r1=1239958&r2=1239959&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Fri Feb 3 00:49:05 2012 @@ -170,6 +170,9 @@ Release 1.0.1 - 2012.01.30 HADOOP-7470. Move up to Jackson 1.8.8. (Enis Soztutar via szetszwo) + 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/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1239959&r1=1239958&r2=1239959&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original) +++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Feb 3 00:49:05 2012 @@ -5681,7 +5681,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/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java?rev=1239959&r1=1239958&r2=1239959&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java (original) +++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java Fri Feb 3 00:49:05 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());