From 678403c4fe99baa676cc89ba24d6af8f7c3917b3 Mon Sep 17 00:00:00 2001 From: Jim Kellerman Date: Sat, 2 Feb 2008 07:19:25 +0000 Subject: [PATCH] HADOOP-2773 Master marks region offline when it is recovering from a region server death git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk/src/contrib/hbase@617767 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ src/java/org/apache/hadoop/hbase/HMaster.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 15e5d823117..d4c6420a887 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,8 @@ Trunk (unreleased changes) HADOOP-2693 NPE in getClosestRowBefore (Bryan Duxbury & Stack) HADOOP-2599 Some minor improvements to changes in HADOOP-2443 (Bryan Duxbury & Stack) + HADOOP-2773 Master marks region offline when it is recovering from a region + server death IMPROVEMENTS HADOOP-2555 Refactor the HTable#get and HTable#getRow methods to avoid diff --git a/src/java/org/apache/hadoop/hbase/HMaster.java b/src/java/org/apache/hadoop/hbase/HMaster.java index 141714322a9..751628f8968 100644 --- a/src/java/org/apache/hadoop/hbase/HMaster.java +++ b/src/java/org/apache/hadoop/hbase/HMaster.java @@ -2103,7 +2103,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface, for (ToDoEntry e: toDoList) { if (e.deleteRegion) { HRegion.removeRegionFromMETA(server, regionName, e.row); - } else { + } else if (e.regionOffline) { HRegion.offlineRegionInMETA(server, regionName, e.info); } }