Author: stack
Date: Tue Jun 14 21:20:14 2011
New Revision: 1135800
URL: http://svn.apache.org/viewvc?rev=1135800&view=rev
Log:
HBASE-3940 HBase daemons should log version info at startup and possibly
periodically
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/Main.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jun 14 21:20:14 2011
@@ -261,6 +261,8 @@ Release 0.91.0 - Unreleased
HBASE-3961 Add Delete.setWriteToWAL functionality (Bruno Dumon)
HBASE-3928 Some potential performance improvements to Bytes/KeyValue
HBASE-3982 Improvements to TestHFileSeek
+ HBASE-3940 HBase daemons should log version info at startup and possibly
+ periodically (Li Pi)
TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue
Jun 14 21:20:14 2011
@@ -1437,6 +1437,7 @@ implements HMasterInterface, HMasterRegi
* @see org.apache.hadoop.hbase.master.HMasterCommandLine
*/
public static void main(String [] args) throws Exception {
+ VersionInfo.logVersion();
new HMasterCommandLine(HMaster.class).doMain(args);
}
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Tue Jun 14 21:20:14 2011
@@ -125,6 +125,7 @@ import org.apache.hadoop.hbase.util.Info
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.Sleeper;
import org.apache.hadoop.hbase.util.Threads;
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperNodeTracker;
@@ -2949,6 +2950,7 @@ public class HRegionServer implements HR
* @see org.apache.hadoop.hbase.regionserver.HRegionServerCommandLine
*/
public static void main(String[] args) throws Exception {
+ VersionInfo.logVersion();
Configuration conf = HBaseConfiguration.create();
@SuppressWarnings("unchecked")
Class<? extends HRegionServer> regionServerClass = (Class<? extends
HRegionServer>) conf
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/Main.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/Main.java?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/Main.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/rest/Main.java Tue Jun 14
21:20:14 2011
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.rest.filter.GzipFilter;
+import org.apache.hadoop.hbase.util.VersionInfo;
import java.util.List;
import java.util.ArrayList;
@@ -68,6 +69,7 @@ public class Main implements Constants {
public static void main(String[] args) throws Exception {
Log LOG = LogFactory.getLog("RESTServer");
+ VersionInfo.logVersion();
Configuration conf = HBaseConfiguration.create();
RESTServlet servlet = RESTServlet.getInstance(conf);
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Tue Jun 14 21:20:14 2011
@@ -70,6 +70,7 @@ import org.apache.hadoop.hbase.thrift.ge
import org.apache.hadoop.hbase.thrift.generated.TRowResult;
import org.apache.hadoop.hbase.thrift.generated.TScan;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TCompactProtocol;
@@ -1022,7 +1023,6 @@ public class ThriftServer {
serverArgs.processor(processor);
serverArgs.protocolFactory(protocolFactory);
serverArgs.transportFactory(transportFactory);
-
LOG.info("starting HBase ThreadPool Thrift server on " + listenAddress +
":" + Integer.toString(listenPort));
server = new TThreadPoolServer(serverArgs);
}
@@ -1035,6 +1035,7 @@ public class ThriftServer {
* @throws Exception
*/
public static void main(String [] args) throws Exception {
+ VersionInfo.logVersion();
doMain(args);
}
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java?rev=1135800&r1=1135799&r2=1135800&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java Tue
Jun 14 21:20:14 2011
@@ -20,13 +20,17 @@
package org.apache.hadoop.hbase.util;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.VersionAnnotation;
+import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.commons.logging.Log;
/**
* This class finds the package info for hbase and the VersionAnnotation
* information. Taken from hadoop. Only name of annotation is different.
*/
public class VersionInfo {
+ private static final Log LOG =
LogFactory.getLog(VersionInfo.class.getName());
private static Package myPackage;
private static VersionAnnotation version;
@@ -82,6 +86,12 @@ public class VersionInfo {
public static String getUrl() {
return version != null ? version.url() : "Unknown";
}
+
+ public static void logVersion(){
+ LOG.info("HBase " + getVersion());
+ LOG.info("Subversion " + getUrl() + " -r " + getRevision());
+ LOG.info("Compiled by " + getUser() + " on " + getDate());
+ }
public static void main(String[] args) {
System.out.println("HBase " + getVersion());
