svn commit: r1446106 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java

[nk...@apache.org]

Author: nkeywal
Date: Thu Feb 14 10:34:20 2013
New Revision: 1446106

URL: http://svn.apache.org/r1446106
Log:
HBASE-7798 ZKAssign logs the wrong server if the transition fails (Sergey Shelukhin)

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java?rev=1446106&r1=1446105&r2=1446106&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java Thu Feb 14 10:34:20 2013
@@ -759,10 +759,11 @@ public class ZKAssign {
     // Verify it is in expected state
     EventType et = rt.getEventType();
     if (!et.equals(beginState)) {
-      LOG.warn(zkw.prefix("Attempt to transition the " +
-        "unassigned node for " + encoded +
-        " from " + beginState + " to " + endState + " failed, " +
-        "the node existed but was in the state " + et + " set by the server " + serverName));
+      String existingServer = (rt.getServerName() == null)
+        ? "<unknown>" : rt.getServerName().toString();
+      LOG.warn(zkw.prefix("Attempt to transition the unassigned node for " + encoded
+        + " from " + beginState + " to " + endState + " failed, the node existed but"
+        + " was in the state " + et + " set by the server " + existingServer));
       return -1;
     }