Author: stack
Date: Sun Dec 19 05:26:30 2010
New Revision: 1050761
URL: http://svn.apache.org/viewvc?rev=1050761&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/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1050761&r1=1050760&r2=1050761&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
Sun Dec 19 05:26:30 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);
