HBASE-1552 provide version running on cluster via getClusterStatus

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@786666 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -196,8 +196,8 @@ Release 0.20.0 - Unreleased
    HBASE-1447  Take last version of the hbase-1249 design doc. and make
                documentation out of it
    HBASE-1206  Scanner spins when there are concurrent inserts to column family
-   HBASE-1536  Controlled crash of regionserver not hosting meta/root leaves master 
-               in spinning state, regions not reassigned
+   HBASE-1536  Controlled crash of regionserver not hosting meta/root leaves
+               master in spinning state, regions not reassigned
    HBASE-1543  Unnecessary toString during scanning costs us some CPU
    HBASE-1544  Cleanup HTable (Jonathan Gray via Stack)
    HBASE-1488  After 1304 goes in, fix and reenable test of thrift, mr indexer,
@@ -367,6 +367,7 @@ Release 0.20.0 - Unreleased
                families results in bad scans
    HBASE-1540  Client delete unit test, define behavior
                (Jonathan Gray via Stack)
+   HBASE-1552  provide version running on cluster via getClusterStatus
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

bin/HBase.rb

@@ -262,6 +262,7 @@ module HBase
     def status(format)
       status = @admin.getClusterStatus()
       if format != nil and format == "detailed"
+        puts("version %s" % [ status.getHBaseVersion() ])
         puts("%d live servers" % [ status.getServers() ])
         for server in status.getServerInfo()
           puts("    %s:%d %d" % \

src/java/org/apache/hadoop/hbase/ClusterStatus.java

@@ -45,6 +45,8 @@ import org.apache.hadoop.io.VersionedWritable;
  */
 public class ClusterStatus extends VersionedWritable {
   private static final byte VERSION = 0;
+
+  private String hbaseVersion;
   private Collection<HServerInfo> liveServerInfo;
   private Collection<String> deadServers;
 
@@ -119,6 +121,20 @@ public class ClusterStatus extends VersionedWritable {
     return count;
   }
 
+  /**
+   * @return the HBase version string as reported by the HMaster
+   */
+  public String getHBaseVersion() {
+    return hbaseVersion;
+  }
+
+  /**
+   * @param version the HBase version string
+   */
+  public void setHBaseVersion(String version) {
+    hbaseVersion = version;
+  }
+
   /**
    * @see java.lang.Object#equals(java.lang.Object)
    */
@@ -130,6 +146,7 @@ public class ClusterStatus extends VersionedWritable {
       return false;
     }
     return (getVersion() == ((ClusterStatus)o).getVersion()) &&
+      getHBaseVersion().equals(((ClusterStatus)o).getHBaseVersion()) &&
       liveServerInfo.equals(((ClusterStatus)o).liveServerInfo) &&
       deadServers.equals(((ClusterStatus)o).deadServers);
   }
@@ -138,7 +155,8 @@ public class ClusterStatus extends VersionedWritable {
    * @see java.lang.Object#hashCode()
    */
   public int hashCode() {
-    return VERSION + liveServerInfo.hashCode() + deadServers.hashCode();
+    return VERSION + hbaseVersion.hashCode() + liveServerInfo.hashCode() +
+      deadServers.hashCode();
   }
 
   /** @return the object version number */
@@ -179,6 +197,7 @@ public class ClusterStatus extends VersionedWritable {
 
   public void write(DataOutput out) throws IOException {
     super.write(out);
+    out.writeUTF(hbaseVersion);
     out.writeInt(liveServerInfo.size());
     for (HServerInfo server: liveServerInfo) {
       server.write(out);
@@ -191,6 +210,7 @@ public class ClusterStatus extends VersionedWritable {
 
   public void readFields(DataInput in) throws IOException {
     super.readFields(in);
+    hbaseVersion = in.readUTF();
     int count = in.readInt();
     liveServerInfo = new ArrayList<HServerInfo>(count);
     for (int i = 0; i < count; i++) {

src/java/org/apache/hadoop/hbase/master/HMaster.java

@@ -78,6 +78,7 @@ import org.apache.hadoop.hbase.util.InfoServer;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.Sleeper;
 import org.apache.hadoop.hbase.util.Writables;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.protocol.FSConstants;
@@ -985,6 +986,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
    */
   public ClusterStatus getClusterStatus() {
     ClusterStatus status = new ClusterStatus();
+    status.setHBaseVersion(VersionInfo.getVersion());
     status.setServerInfo(serverManager.serversToServerInfo.values());
     status.setDeadServers(serverManager.deadServers);
     return status;