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

HBASE-13206 Fix TableLock tableName log format

This commit is contained in:
Matteo Bertozzi 2015-03-11 18:27:18 +00:00
parent c78243af61
commit f8dced1e6d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java
View File

@ -240,8 +240,10 @@ public abstract class TableLockManager {
return; return;
} }
LOG.debug("Table is locked by " + LOG.debug("Table is locked by " +
String.format("[tableName=%s, lockOwner=%s, threadId=%s, " + String.format("[tableName=%s:%s, lockOwner=%s, threadId=%s, " +
"purpose=%s, isShared=%s, createTime=%s]", Bytes.toString(data.getTableName().toByteArray()), "purpose=%s, isShared=%s, createTime=%s]",
data.getTableName().getNamespace().toStringUtf8(),
data.getTableName().getQualifier().toStringUtf8(),
ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(), ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(),
data.getPurpose(), data.getIsShared(), data.getCreateTime())); data.getPurpose(), data.getIsShared(), data.getCreateTime()));
} }

6
hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java
View File

@ -59,8 +59,10 @@ public class TableLockChecker {
String msg = "Table lock acquire attempt found:"; String msg = "Table lock acquire attempt found:";
if (data != null) { if (data != null) {
msg = msg + msg = msg +
String.format("[tableName=%s, lockOwner=%s, threadId=%s, " + String.format("[tableName=%s:%s, lockOwner=%s, threadId=%s, " +
"purpose=%s, isShared=%s, createTime=%s]", Bytes.toString(data.getTableName().toByteArray()), "purpose=%s, isShared=%s, createTime=%s]",
data.getTableName().getNamespace().toStringUtf8(),
data.getTableName().getQualifier().toStringUtf8(),
ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(), ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(),
data.getPurpose(), data.getIsShared(), data.getCreateTime()); data.getPurpose(), data.getIsShared(), data.getCreateTime());
} }