You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/04/07 21:56:10 UTC
svn commit: r1585576 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler:
MetaServerShutdownHandler.java ServerShutdownHandler.java
Author: jxiang
Date: Mon Apr 7 19:56:10 2014
New Revision: 1585576
URL: http://svn.apache.org/r1585576
Log:
HBASE-10911 ServerShutdownHandler#toString shows meaningless message
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java?rev=1585576&r1=1585575&r2=1585576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java Mon Apr 7 19:56:10 2014
@@ -199,15 +199,6 @@ public class MetaServerShutdownHandler e
}
@Override
- public String toString() {
- String name = "UnknownServerName";
- if(server != null && server.getServerName() != null) {
- name = server.getServerName().toString();
- }
- return getClass().getSimpleName() + "-" + name + "-" + getSeqid();
- }
-
- @Override
protected void handleException(Throwable t) {
int count = eventExceptionCount.getAndIncrement();
if (count < 0) count = eventExceptionCount.getAndSet(0);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1585576&r1=1585575&r2=1585576&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Mon Apr 7 19:56:10 2014
@@ -108,11 +108,7 @@ public class ServerShutdownHandler exten
@Override
public String toString() {
- String name = "UnknownServerName";
- if(server != null && server.getServerName() != null) {
- name = server.getServerName().toString();
- }
- return getClass().getSimpleName() + "-" + name + "-" + getSeqid();
+ return getClass().getSimpleName() + "-" + serverName + "-" + getSeqid();
}
@Override