From 1758553f45e4a38e493f0cb5dee37e483c33905a Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 22 Dec 2010 20:28:57 +0000 Subject: [PATCH] HBASE-3388 NPE processRegionInTransition(AssignmentManager.java:264) doing rolling-restart.sh git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1052058 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ .../apache/hadoop/hbase/master/AssignmentManager.java | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f73e9a409d5..030ae6e4bed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -803,6 +803,8 @@ Release 0.90.0 - Unreleased HBASE-3343 Server not shutting down after losing log lease HBASE-3381 Interrupt of a region open comes across as a successful open HBASE-3386 NPE in TableRecordReaderImpl.restart + HBASE-3388 NPE processRegionInTransition(AssignmentManager.java:264) + doing rolling-restart.sh IMPROVEMENTS diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index ea064f2e80b..2b345fb2ff5 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -261,8 +261,13 @@ public class AssignmentManager extends ZooKeeperListener { throws KeeperException, IOException { RegionTransitionData data = ZKAssign.getData(watcher, encodedRegionName); if (data == null) return false; - HRegionInfo hri = (regionInfo != null)? regionInfo: - MetaReader.getRegion(catalogTracker, data.getRegionName()).getFirst(); + HRegionInfo hri = regionInfo; + if (hri == null) { + Pair p = + MetaReader.getRegion(catalogTracker, data.getRegionName()); + if (p == null) return false; + hri = p.getFirst(); + } processRegionsInTransition(data, hri); return true; }