Check hris against null in ServerShutdownHandler.process()
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1153027 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8920ca766d
commit
488537b281
|
@ -220,6 +220,7 @@ public class ServerShutdownHandler extends EventHandler {
|
||||||
" regions(s) that are already in transition)");
|
" regions(s) that are already in transition)");
|
||||||
|
|
||||||
// Iterate regions that were on this server and assign them
|
// Iterate regions that were on this server and assign them
|
||||||
|
if (hris != null) {
|
||||||
for (Map.Entry<HRegionInfo, Result> e: hris.entrySet()) {
|
for (Map.Entry<HRegionInfo, Result> e: hris.entrySet()) {
|
||||||
if (processDeadRegion(e.getKey(), e.getValue(),
|
if (processDeadRegion(e.getKey(), e.getValue(),
|
||||||
this.services.getAssignmentManager(),
|
this.services.getAssignmentManager(),
|
||||||
|
@ -227,6 +228,7 @@ public class ServerShutdownHandler extends EventHandler {
|
||||||
this.services.getAssignmentManager().assign(e.getKey(), true);
|
this.services.getAssignmentManager().assign(e.getKey(), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.deadServers.finish(serverName);
|
this.deadServers.finish(serverName);
|
||||||
LOG.info("Finished processing of shutdown of " + serverName);
|
LOG.info("Finished processing of shutdown of " + serverName);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue