svn commit: r1050760 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

[st...@apache.org]

Author: stack
Date: Sun Dec 19 05:25:53 2010
New Revision: 1050760

URL: http://svn.apache.org/viewvc?rev=1050760&view=rev
Log:
Missing piece of HBASE-3368 Split message can come in before region opened message; results in 'Region has been PENDING_CLOSE for too long' cycle

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1050760&r1=1050759&r2=1050760&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java Sun Dec 19 05:25:53 2010
@@ -162,7 +162,11 @@ class CatalogJanitor extends Chore {
         " because daughter splits no longer hold references");
       // This latter regionOffline should not be necessary but is done for now
       // until we let go of regionserver to master heartbeats.  See HBASE-3368.
-      this.services.getAssignmentManager().regionOffline(parent);
+      if (this.services.getAssignmentManager() != null) {
+        // The mock used in testing catalogjanitor returns null for getAssignmnetManager.
+        // Allow for null result out of getAssignmentManager.
+        this.services.getAssignmentManager().regionOffline(parent);
+      }
       FileSystem fs = this.services.getMasterFileSystem().getFileSystem();
       Path rootdir = this.services.getMasterFileSystem().getRootDir();
       HRegion.deleteRegion(fs, rootdir, parent);