svn commit: r1181927 - in /hbase/branches/0.89/src: main/resources/hbase-webapps/master/master.jsp main/resources/hbase-webapps/regionserver/regionserver.jsp saveVersion.sh

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 17:42:28 2011
New Revision: 1181927

URL: http://svn.apache.org/viewvc?rev=1181927&view=rev
Log:
Print the correct revision number

Summary:
Previously, If we build hbase with git repository, it will show the revision as
unKnown.

This diff will print the branch_name@revision_name as revision for both svn
and git repository

Test Plan: tested in my dev cluster
Reviewed By: nspiegelberg
Reviewers: kannan, mbautin, kranganathan, nspiegelberg
CC: , hbase@lists, nspiegelberg, liyintang
Differential Revision: 302437

Modified:
    hbase/branches/0.89/src/main/resources/hbase-webapps/master/master.jsp
    hbase/branches/0.89/src/main/resources/hbase-webapps/regionserver/regionserver.jsp
    hbase/branches/0.89/src/saveVersion.sh

Modified: hbase/branches/0.89/src/main/resources/hbase-webapps/master/master.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/resources/hbase-webapps/master/master.jsp?rev=1181927&r1=1181926&r2=1181927&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/resources/hbase-webapps/master/master.jsp (original)
+++ hbase/branches/0.89/src/main/resources/hbase-webapps/master/master.jsp Tue Oct 11 17:42:28 2011
@@ -62,7 +62,7 @@
 <h2>Master Attributes</h2>
 <table>
 <tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
-<tr><td>HBase Version</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and svn revision</td></tr>
+<tr><td>HBase Version</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and branch@revision</td></tr>
 <tr><td>HBase Compiled</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td><td>When HBase version was compiled and by whom</td></tr>
 <tr><td>Hadoop Version</td><td><%= org.apache.hadoop.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.util.VersionInfo.getRevision() %></td><td>Hadoop version and svn revision</td></tr>
 <tr><td>Hadoop Compiled</td><td><%= org.apache.hadoop.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.util.VersionInfo.getUser() %></td><td>When Hadoop version was compiled and by whom</td></tr>

Modified: hbase/branches/0.89/src/main/resources/hbase-webapps/regionserver/regionserver.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/resources/hbase-webapps/regionserver/regionserver.jsp?rev=1181927&r1=1181926&r2=1181927&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/resources/hbase-webapps/regionserver/regionserver.jsp (original)
+++ hbase/branches/0.89/src/main/resources/hbase-webapps/regionserver/regionserver.jsp Tue Oct 11 17:42:28 2011
@@ -39,7 +39,7 @@
 <h2>Region Server Attributes</h2>
 <table>
 <tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
-<tr><td>HBase Version</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and svn revision</td></tr>
+<tr><td>HBase Version</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and branch@revision</td></tr>
 <tr><td>HBase Compiled</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td><td>When HBase version was compiled and by whom</td></tr>
 <tr><td>Metrics</td><td><%= metrics.toString() %></td><td>RegionServer Metrics; file and heap sizes are in megabytes</td></tr>
 <tr><td>Zookeeper Quorum</td><td><%= regionServer.getZooKeeperWrapper().getQuorumServers() %></td><td>Addresses of all registered ZK servers</td></tr>

Modified: hbase/branches/0.89/src/saveVersion.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/saveVersion.sh?rev=1181927&r1=1181926&r2=1181927&view=diff
==============================================================================
--- hbase/branches/0.89/src/saveVersion.sh (original)
+++ hbase/branches/0.89/src/saveVersion.sh Tue Oct 11 17:42:28 2011
@@ -26,15 +26,29 @@ user=`whoami`
 date=`date`
 cwd=`pwd`
 if [ -d .svn ]; then
-  revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
+  svn_revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
   url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
+	branch=`echo $url | cut -f7 -d\/`
+  revision= $branch@$svn_revision
 elif [ -d .git ]; then
   revision=`git log -1 --pretty=format:"%H"`
   hostname=`hostname`
   url="git://${hostname}${cwd}"
 else
-  revision="Unknown"
-  url="file://$cwd"
+	which git  > /dev/null
+	if [ $? == 0 ]; then
+   revision=`git log -1 | grep "git-svn-id:" | awk '{print $2}' | cut -f7 -d\/`
+		hostname=`hostname`
+		if [ "$revision" == "" ]; then
+			git_revision=`git log -1 --pretty=format:"%H"`
+			git_branch=`git branch 2> /dev/null | grep -e '\* ' | sed 's/^..\(.*\)/\1/'`
+			revision="LocalCommit: $git_branch@$git_revision"
+		fi
+		url="git://${hostname}${cwd}"
+	else
+		revision="Unknown"
+		url="file://$cwd"
+	fi
 fi
 mkdir -p "$outputDirectory/org/apache/hadoop/hbase"
 cat >"$outputDirectory/org/apache/hadoop/hbase/package-info.java" <<EOF