You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/04/28 17:30:37 UTC
[1/2] hbase git commit: HBASE-17514 emit a warning if thrift1 proxy
user is configured but hbase.regionserver.thrift.http is not
Repository: hbase
Updated Branches:
refs/heads/branch-1.1 5272d68ff -> e62d7a6d2
HBASE-17514 emit a warning if thrift1 proxy user is configured but hbase.regionserver.thrift.http is not
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/23a3e755
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/23a3e755
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/23a3e755
Branch: refs/heads/branch-1.1
Commit: 23a3e755f676f5f11fb5eae935c62ba389487a89
Parents: 5272d68
Author: lv zehui <ma...@gmail.com>
Authored: Sat Apr 22 21:20:00 2017 +0800
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 28 12:22:31 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/23a3e755/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
index e530cc4..710d608 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
@@ -313,6 +313,11 @@ public class ThriftServerRunner implements Runnable {
this.realUser = userProvider.getCurrent().getUGI();
qop = conf.get(THRIFT_QOP_KEY);
doAsEnabled = conf.getBoolean(THRIFT_SUPPORT_PROXYUSER, false);
+ if (doAsEnabled) {
+ if (!conf.getBoolean(USE_HTTP_CONF_KEY, false)) {
+ LOG.warn("Fail to enable the doAs feature. hbase.regionserver.thrift.http is not configured ");
+ }
+ }
if (qop != null) {
if (!qop.equals("auth") && !qop.equals("auth-int")
&& !qop.equals("auth-conf")) {
[2/2] hbase git commit: HBASE-17817 add table name to output (if
available) when removing coprocessors
Posted by bu...@apache.org.
HBASE-17817 add table name to output (if available) when removing coprocessors
Amending-Author: Sean Busbey <bu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e62d7a6d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e62d7a6d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e62d7a6d
Branch: refs/heads/branch-1.1
Commit: e62d7a6d26ffaba8f30cc7e858df7f3eb10e0b76
Parents: 23a3e75
Author: Steen Manniche <st...@manniche.net>
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 28 12:23:27 2017 -0500
----------------------------------------------------------------------
.../apache/hadoop/hbase/coprocessor/CoprocessorHost.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e62d7a6d/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
index 30051d1..8271626 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.java
@@ -559,8 +559,15 @@ public abstract class CoprocessorHost<E extends CoprocessorEnvironment> {
// server is configured to abort.
abortServer(env, e);
} else {
- LOG.error("Removing coprocessor '" + env.toString() + "' from " +
- "environment because it threw: " + e,e);
+ // If available, pull a table name out of the environment
+ if(env instanceof RegionCoprocessorEnvironment) {
+ String tableName = ((RegionCoprocessorEnvironment)env).getRegionInfo().getTable().getNameAsString();
+ LOG.error("Removing coprocessor '" + env.toString() + "' from table '"+ tableName + "'", e);
+ } else {
+ LOG.error("Removing coprocessor '" + env.toString() + "' from " +
+ "environment",e);
+ }
+
coprocessors.remove(env);
try {
shutdown(env);