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

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1050760 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-12-19 05:25:53 +00:00
parent ef96f37844
commit caf235d34d
1 changed files with 5 additions and 1 deletions

View File

@ -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);