From 148627fe9c029405b393a0bbcf5c16cec5cd48a9 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 13 Jul 2011 04:18:50 +0000 Subject: [PATCH] HBASE-4088 npes in server shutdown git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1145855 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + .../hadoop/hbase/master/handler/ServerShutdownHandler.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 519888d369a..0b9ba405e28 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -407,6 +407,7 @@ Release 0.90.4 - Unreleased are hosted by the HRegionServer (Akash Ashok) HBASE-4033 The shutdown RegionServer could be added to AssignmentManager.servers again (Jieshan Bean) + HBASE-4088 npes in server shutdown IMPROVEMENT HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the diff --git a/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java b/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java index 7082342de9d..2116f960a08 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java +++ b/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java @@ -186,7 +186,8 @@ public class ServerShutdownHandler extends EventHandler { } } - LOG.info("Reassigning " + hris.size() + " region(s) that " + serverName + + LOG.info("Reassigning " + (hris == null? 0: hris.size()) + + " region(s) that " + serverName + " was carrying (skipping " + regionsInTransition.size() + " regions(s) that are already in transition)");