You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2015/03/11 19:35:14 UTC
[1/4] hbase git commit: HBASE-13206 Fix TableLock tableName log format
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 <ma...@cloudera.com>
Authored: Wed Mar 11 18:27:18 2015 +0000
Committer: Matteo Bertozzi <ma...@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());
}
[3/4] hbase git commit: HBASE-13206 Fix TableLock tableName log format
Posted by mb...@apache.org.
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 <ma...@cloudera.com>
Authored: Wed Mar 11 18:27:18 2015 +0000
Committer: Matteo Bertozzi <ma...@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());
}
[4/4] hbase git commit: HBASE-13206 Fix TableLock tableName log format
Posted by mb...@apache.org.
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/b58e954e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b58e954e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b58e954e
Branch: refs/heads/0.98
Commit: b58e954efcc4481495232de0f7d299f0db9a3e1b
Parents: d4e8200
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Mar 11 18:27:18 2015 +0000
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Mar 11 18:28:02 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/b58e954e/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 7750fdf..5f4593b 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/b58e954e/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 a7afc10..71c9829 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());
}
[2/4] hbase git commit: HBASE-13206 Fix TableLock tableName log format
Posted by mb...@apache.org.
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/f8dced1e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f8dced1e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f8dced1e
Branch: refs/heads/branch-1
Commit: f8dced1e6dd63225bf3e43740bc9a227b0c514e7
Parents: c78243a
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Wed Mar 11 18:27:18 2015 +0000
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Wed Mar 11 18:27:41 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/f8dced1e/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/f8dced1e/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());
}