Repository: hbase Updated Branches: refs/heads/0.98 d4e820069 -> b58e954ef refs/heads/branch-1 c78243af6 -> f8dced1e6 refs/heads/branch-1.0 0bbb606ea -> 1b2ea696f refs/heads/master 9087febd2 -> b5bfbc8a9
HBASE-13206 Fix TableLock tableName log format Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b5bfbc8a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b5bfbc8a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b5bfbc8a Branch: refs/heads/master Commit: b5bfbc8a9f4e9e25ba622c8a6f35f258d72af8ed Parents: 9087feb Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Wed Mar 11 18:27:18 2015 +0000 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Wed Mar 11 18:27:18 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/TableLockManager.java | 6 ++++-- .../org/apache/hadoop/hbase/util/hbck/TableLockChecker.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b5bfbc8a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java index 0f0922d..cfaeb98 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java @@ -240,8 +240,10 @@ public abstract class TableLockManager { return; } LOG.debug("Table is locked by " + - String.format("[tableName=%s, lockOwner=%s, threadId=%s, " + - "purpose=%s, isShared=%s, createTime=%s]", Bytes.toString(data.getTableName().toByteArray()), + String.format("[tableName=%s:%s, lockOwner=%s, threadId=%s, " + + "purpose=%s, isShared=%s, createTime=%s]", + data.getTableName().getNamespace().toStringUtf8(), + data.getTableName().getQualifier().toStringUtf8(), ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(), data.getPurpose(), data.getIsShared(), data.getCreateTime())); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b5bfbc8a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java index 3e069d9..49594bc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/TableLockChecker.java @@ -59,8 +59,10 @@ public class TableLockChecker { String msg = "Table lock acquire attempt found:"; if (data != null) { msg = msg + - String.format("[tableName=%s, lockOwner=%s, threadId=%s, " + - "purpose=%s, isShared=%s, createTime=%s]", Bytes.toString(data.getTableName().toByteArray()), + String.format("[tableName=%s:%s, lockOwner=%s, threadId=%s, " + + "purpose=%s, isShared=%s, createTime=%s]", + data.getTableName().getNamespace().toStringUtf8(), + data.getTableName().getQualifier().toStringUtf8(), ProtobufUtil.toServerName(data.getLockOwner()), data.getThreadId(), data.getPurpose(), data.getIsShared(), data.getCreateTime()); }
