From 0f5932b059a86c92c1d61e6a1dcd2c2fe9994b7a Mon Sep 17 00:00:00 2001
From: Steen Manniche <steen@manniche.net>
Date: Tue, 11 Apr 2017 17:48:50 +0200
Subject: [PATCH] HBASE-17817 add table name to output (if available) when
 removing coprocessors

Amending-Author: Sean Busbey <busbey@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
---
 .../hadoop/hbase/coprocessor/CoprocessorHost.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 91b90576de3..f2b201b42ce 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<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);