From e3447cdf07a51688dafcefca1110e7aef2f67706 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 11 Jul 2012 13:50:09 +0000
Subject: [PATCH] HBASE-5151 Rename hbase.skip.errors in HRegion as it is too
 general-sounding

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1360172 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/hadoop/hbase/HConstants.java    |  6 ++++++
 .../apache/hadoop/hbase/regionserver/HRegion.java   | 13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 82cf976a1b3..e0e3e6ce93a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -260,6 +260,12 @@ public final class HConstants {
   public static final String HREGION_MEMSTORE_FLUSH_SIZE =
       "hbase.hregion.memstore.flush.size";
 
+  public static final String HREGION_EDITS_REPLAY_SKIP_ERRORS =
+      "hbase.hregion.edits.replay.skip.errors";
+
+  public static final boolean DEFAULT_HREGION_EDITS_REPLAY_SKIP_ERRORS =
+      false;
+
   /** Default size of a reservation block   */
   public static final int DEFAULT_SIZE_RESERVATION_BLOCK = 1024 * 1024 * 5;
 
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 95e83135a4a..671fa3f9d63 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -2839,10 +2839,19 @@ public class HRegion implements HeapSize { // , Writable{
       try {
         seqid = replayRecoveredEdits(edits, maxSeqIdInStores, reporter);
       } catch (IOException e) {
-        boolean skipErrors = conf.getBoolean("hbase.skip.errors", false);
+        boolean skipErrors = conf.getBoolean(
+            HConstants.HREGION_EDITS_REPLAY_SKIP_ERRORS,
+            conf.getBoolean(
+                "hbase.skip.errors",
+                HConstants.DEFAULT_HREGION_EDITS_REPLAY_SKIP_ERRORS));
+        if (conf.get("hbase.skip.errors") != null) {
+          LOG.warn(
+              "The property 'hbase.skip.errors' has been deprecated. Please use " +
+              HConstants.HREGION_EDITS_REPLAY_SKIP_ERRORS + " instead.");
+        }
         if (skipErrors) {
           Path p = HLog.moveAsideBadEditsFile(fs, edits);
-          LOG.error("hbase.skip.errors=true so continuing. Renamed " + edits +
+          LOG.error(HConstants.HREGION_EDITS_REPLAY_SKIP_ERRORS"=true so continuing. Renamed " + edits +
             " as " + p, e);
         } else {
           throw e;