hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mberto...@apache.org
Subject [3/4] hbase git commit: HBASE-13206 Fix TableLock tableName log format
Date Wed, 11 Mar 2015 18:35:16 GMT
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/1b2ea696
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b2ea696
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b2ea696

Branch: refs/heads/branch-1.0
Commit: 1b2ea696f5ce94813027ac9aef074c1ee050b9d0
Parents: 0bbb606
Author: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Authored: Wed Mar 11 18:27:18 2015 +0000
Committer: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Committed: Wed Mar 11 18:27:53 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/1b2ea696/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/1b2ea696/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());
         }


Mime
View raw message