Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6682 Bad characters in logs for server names: SplitLogManager: task following PBUF (Aleksandr) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1379607 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-08-31 20:58:56 +00:00
parent 2dbdc1ec15
commit c65184314b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
View File

@ -478,10 +478,10 @@ public class SplitLogManager extends ZooKeeperListener {
} else if (slt.isOwned()) { } else if (slt.isOwned()) {
heartbeat(path, version, slt.getServerName()); heartbeat(path, version, slt.getServerName());
} else if (slt.isResigned()) { } else if (slt.isResigned()) {
LOG.info("task " + path + " entered state " + new String(data)); LOG.info("task " + path + " entered state: " + slt.toString());
resubmitOrFail(path, FORCE); resubmitOrFail(path, FORCE);
} else if (slt.isDone()) { } else if (slt.isDone()) {
LOG.info("task " + path + " entered state " + new String(data)); LOG.info("task " + path + " entered state: " + slt.toString());
if (taskFinisher != null && !ZKSplitLog.isRescanNode(watcher, path)) { if (taskFinisher != null && !ZKSplitLog.isRescanNode(watcher, path)) {
if (taskFinisher.finish(slt.getServerName(), ZKSplitLog.getFileName(path)) == Status.DONE) { if (taskFinisher.finish(slt.getServerName(), ZKSplitLog.getFileName(path)) == Status.DONE) {
setDone(path, SUCCESS); setDone(path, SUCCESS);
@ -492,10 +492,10 @@ public class SplitLogManager extends ZooKeeperListener {
setDone(path, SUCCESS); setDone(path, SUCCESS);
} }
} else if (slt.isErr()) { } else if (slt.isErr()) {
LOG.info("task " + path + " entered state " + new String(data)); LOG.info("task " + path + " entered state: " + slt.toString());
resubmitOrFail(path, CHECK); resubmitOrFail(path, CHECK);
} else { } else {
LOG.fatal("logic error - unexpected zk state for path = " + path + " data = " + new String(data)); LOG.fatal("logic error - unexpected zk state for path = " + path + " data = " + slt.toString());
setDone(path, FAILURE); setDone(path, FAILURE);
} }
} }