svn commit: r1344476 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler: CreateTableHandler.java DisableTableHandler.java EnableTableHandler.java

[st...@apache.org]

Author: stack
Date: Wed May 30 21:42:37 2012
New Revision: 1344476

URL: http://svn.apache.org/viewvc?rev=1344476&view=rev
Log:
HBASE-6120 Few logging improvements around enabling tables

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java?rev=1344476&r1=1344475&r2=1344476&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java Wed May 30 21:42:37 2012
@@ -125,7 +125,7 @@ public class CreateTableHandler extends 
   public void process() {
     String tableName = this.hTableDescriptor.getNameAsString();
     try {
-      LOG.info("Attemping to create the table " + tableName);
+      LOG.info("Attempting to create the table " + tableName);
       MasterCoprocessorHost cpHost = ((HMaster) this.server).getCoprocessorHost();
       if (cpHost != null) {
         cpHost.preCreateTableHandler(this.hTableDescriptor, this.newRegions);

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java?rev=1344476&r1=1344475&r2=1344476&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java Wed May 30 21:42:37 2012
@@ -98,7 +98,7 @@ public class DisableTableHandler extends
   @Override
   public void process() {
     try {
-      LOG.info("Attemping to disable table " + this.tableNameStr);
+      LOG.info("Attempting to disable table " + this.tableNameStr);
       MasterCoprocessorHost cpHost = ((HMaster) this.server)
           .getCoprocessorHost();
       if (cpHost != null) {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=1344476&r1=1344475&r2=1344476&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java Wed May 30 21:42:37 2012
@@ -97,7 +97,7 @@ public class EnableTableHandler extends 
   @Override
   public void process() {
     try {
-      LOG.info("Attemping to enable the table " + this.tableNameStr);
+      LOG.info("Attempting to enable the table " + this.tableNameStr);
       MasterCoprocessorHost cpHost = ((HMaster) this.server)
           .getCoprocessorHost();
       if (cpHost != null) {
@@ -131,8 +131,8 @@ public class EnableTableHandler extends 
     if (regionsCount == 0) {
       done = true;
     }
-    LOG.info("Table has " + countOfRegionsInTable + " regions of which " +
-      regionsCount + " are offline.");
+    LOG.info("Table '" + this.tableNameStr + "' has " + countOfRegionsInTable
+      + " regions, of which " + regionsCount + " are offline.");
     BulkEnabler bd = new BulkEnabler(this.server, regions,
       countOfRegionsInTable);
     try {
@@ -140,14 +140,21 @@ public class EnableTableHandler extends 
         done = true;
       }
     } catch (InterruptedException e) {
-      LOG.warn("Enable was interrupted");
+      LOG.warn("Enable operation was interrupted when enabling table '"
+        + this.tableNameStr + "'");
       // Preserve the interrupt.
       Thread.currentThread().interrupt();
     }
-    // Flip the table to enabled.
-    if (done) this.assignmentManager.getZKTable().setEnabledTable(
-      this.tableNameStr);
-    LOG.info("Enabled table is done=" + done);
+    if (done) {
+      // Flip the table to enabled.
+      this.assignmentManager.getZKTable().setEnabledTable(
+        this.tableNameStr);
+      LOG.info("Table '" + this.tableNameStr
+      + "' was successfully enabled. Status: done=" + done);
+    } else {
+      LOG.warn("Table '" + this.tableNameStr
+      + "' wasn't successfully enabled. Status: done=" + done);
+    }
   }
 
   /**