[2/2] hbase git commit: HBASE-17817 add table name to output (if available) when removing coprocessors

2017-04-28 Thread busbey 
HBASE-17817 add table name to output (if available) when removing coprocessors

Amending-Author: Sean Busbey 
Signed-off-by: Sean Busbey 


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 
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey 
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 {
   // 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);

hbase git commit: HBASE-17817 add table name to output (if available) when removing coprocessors

2017-04-28 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 92eefa388 -> 236a8d06a


HBASE-17817 add table name to output (if available) when removing coprocessors

Amending-Author: Sean Busbey 
Signed-off-by: Sean Busbey 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/236a8d06
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/236a8d06
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/236a8d06

Branch: refs/heads/branch-1.2
Commit: 236a8d06a3d4fcbba847be1cadd4d795a618fd97
Parents: 92eefa3
Author: Steen Manniche 
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey 
Committed: Fri Apr 28 12:16:48 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/236a8d06/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 {
   // 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);

hbase git commit: HBASE-17817 add table name to output (if available) when removing coprocessors

2017-04-28 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 6b04084ab -> e4c8a858b


HBASE-17817 add table name to output (if available) when removing coprocessors

Amending-Author: Sean Busbey 
Signed-off-by: Sean Busbey 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4c8a858
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4c8a858
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4c8a858

Branch: refs/heads/branch-1.3
Commit: e4c8a858b1957ab1123d0daf5a21507c7737f519
Parents: 6b04084
Author: Steen Manniche 
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey 
Committed: Fri Apr 28 11:54:46 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/e4c8a858/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 {
   // 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);

[1/3] hbase git commit: HBASE-17817 add table name to output (if available) when removing coprocessors

2017-04-28 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 3765e7bed -> fa4f63894


HBASE-17817 add table name to output (if available) when removing coprocessors

Amending-Author: Sean Busbey 
Signed-off-by: Sean Busbey 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f5932b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f5932b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f5932b0

Branch: refs/heads/branch-1
Commit: 0f5932b059a86c92c1d61e6a1dcd2c2fe9994b7a
Parents: 3765e7b
Author: Steen Manniche 
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey 
Committed: Fri Apr 28 11:39:54 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/0f5932b0/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 91b9057..f2b201b 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
@@ -580,8 +580,15 @@ public abstract class CoprocessorHost {
   // 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);

[1/4] hbase git commit: HBASE-17817 add table name to output (if available) when removing coprocessors

2017-04-28 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/master 5411d3ecb -> fc68f23a4


HBASE-17817 add table name to output (if available) when removing coprocessors

Amending-Author: Sean Busbey 
Signed-off-by: Sean Busbey 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/635c9db8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/635c9db8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/635c9db8

Branch: refs/heads/master
Commit: 635c9db81556f7b3a89c76d3be40d9989496d151
Parents: 5411d3e
Author: Steen Manniche 
Authored: Tue Apr 11 17:48:50 2017 +0200
Committer: Sean Busbey 
Committed: Fri Apr 28 11:24:00 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/635c9db8/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 bdface1..ae0c4b1 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
@@ -601,8 +601,15 @@ public abstract class CoprocessorHost {
   // 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);