Index: src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/TableModifyFamilyHandler.java (working copy) @@ -62,4 +62,16 @@ this.masterServices.getMasterFileSystem().updateRegionInfo(hri); } } + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + String family = "UnknownFamily"; + if(familyDesc != null) { + family = familyDesc.getNameAsString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr + "-" + family; + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (working copy) @@ -52,7 +52,6 @@ public class ServerShutdownHandler extends EventHandler { private static final Log LOG = LogFactory.getLog(ServerShutdownHandler.class); private final ServerName serverName; - private final Server server; private final MasterServices services; private final DeadServer deadServers; @@ -88,6 +87,15 @@ } @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid(); + } + + @Override public void process() throws IOException { final ServerName serverName = this.serverName; Index: src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/TableAddFamilyHandler.java (working copy) @@ -63,4 +63,16 @@ this.masterServices.getMasterFileSystem().updateRegionInfo(hri); } } + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + String family = "UnknownFamily"; + if(familyDesc != null) { + family = familyDesc.getNameAsString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr + "-" + family; + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java (working copy) @@ -50,4 +50,13 @@ boolean isCarryingMeta() { return this.carryingMeta; } + + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid(); + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (working copy) @@ -75,4 +75,13 @@ // Call to undisableTable does this. TODO: Make a more formal purge table. am.getZKTable().setEnabledTable(Bytes.toString(tableName)); } + + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr; + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java (working copy) @@ -62,6 +62,15 @@ } @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr; + } + + @Override public void process() { try { LOG.info("Attemping to disable table " + this.tableNameStr); Index: src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/TableDeleteFamilyHandler.java (working copy) @@ -66,4 +66,16 @@ this.masterServices.getMasterFileSystem().updateRegionInfo(hri); } } + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + String family = "UnknownFamily"; + if(familyName != null) { + family = Bytes.toString(familyName); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr + "-" + family; + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java (working copy) @@ -79,6 +79,15 @@ } @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid(); + } + + @Override public void process() { LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName()); // Check if this table is being disabled or not Index: src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (working copy) @@ -61,6 +61,15 @@ } @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr; + } + + @Override public void process() { try { LOG.info("Attemping to enable the table " + this.tableNameStr); Index: src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java (working copy) @@ -78,8 +78,17 @@ public HRegionInfo getHRegionInfo() { return this.regionInfo; } - + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid(); + } + + @Override public void process() { LOG.debug("Handling OPENED event for " + this.regionInfo.getEncodedName() + "; deleting unassigned node"); Index: src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java (working copy) @@ -49,4 +49,12 @@ this.masterServices.getMasterFileSystem().updateRegionInfo(hri); } } + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + tableNameStr; + } } \ No newline at end of file Index: src/main/java/org/apache/hadoop/hbase/master/handler/SplitRegionHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/SplitRegionHandler.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/master/handler/SplitRegionHandler.java (working copy) @@ -59,6 +59,19 @@ public HRegionInfo getHRegionInfo() { return this.parent; } + + @Override + public String toString() { + String name = "UnknownServerName"; + if(server != null && server.getServerName() != null) { + name = server.getServerName().toString(); + } + String parentRegion = "UnknownRegion"; + if(parent != null) { + parentRegion = parent.getRegionNameAsString(); + } + return getClass().getSimpleName() + "-" + name + "-" + getSeqid() + "-" + parentRegion; + } @Override public void process() { Index: src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java (revision 1125781) +++ src/main/java/org/apache/hadoop/hbase/executor/ExecutorService.java (working copy) @@ -27,6 +27,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -188,7 +189,7 @@ List wasRunning = entry.getValue().threadPoolExecutor.shutdownNow(); if (!wasRunning.isEmpty()) { - LOG.info(entry.getKey() + " had " + wasRunning + " on shutdown"); + LOG.info(entry.getValue() + " had " + wasRunning + " on shutdown"); } } this.executorMap.clear(); @@ -255,9 +256,12 @@ final BlockingQueue q = new LinkedBlockingQueue(); private final String name; private final Map eventHandlerListeners; - + private static final AtomicLong seqids = new AtomicLong(0); + private final long id; + protected Executor(String name, int maxThreads, final Map eventHandlerListeners) { + this.id = seqids.incrementAndGet(); this.name = name; this.eventHandlerListeners = eventHandlerListeners; // create the thread pool executor @@ -283,5 +287,9 @@ } this.threadPoolExecutor.execute(event); } + + public String toString() { + return getClass().getSimpleName() + "-" + id + "-" + name; + } } }