From 5a510596f591ab21bd7d4c184b59d72bf8aa47f0 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 20 Sep 2017 18:28:18 -0700 Subject: [PATCH] HBASE-18786 FileNotFoundException should not be silently handled for primary region replicas --- .../apache/hadoop/hbase/regionserver/HRegion.java | 49 +++------------- .../hbase/regionserver/RegionUnassigner.java | 68 ---------------------- 2 files changed, 8 insertions(+), 109 deletions(-) delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionUnassigner.java 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 de2461bd92..f5d02997a4 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 @@ -216,9 +216,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi public static final String HREGION_MVCC_PRE_ASSIGN = "hbase.hregion.mvcc.preassign"; public static final boolean DEFAULT_HREGION_MVCC_PRE_ASSIGN = true; - public static final String HREGION_UNASSIGN_FOR_FNFE = "hbase.hregion.unassign.for.fnfe"; - public static final boolean DEFAULT_HREGION_UNASSIGN_FOR_FNFE = true; - public static final String HBASE_MAX_CELL_SIZE_KEY = "hbase.server.keyvalue.maxsize"; public static final int DEFAULT_MAX_CELL_SIZE = 10485760; @@ -674,8 +671,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi private final Durability durability; private final boolean regionStatsEnabled; - // whether to unassign region if we hit FNFE - private final RegionUnassigner regionUnassigner; /** * HRegion constructor. This constructor should only be used for testing and * extensions. Instances of HRegion should be instantiated with the @@ -827,14 +822,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi HConstants.DEFAULT_ENABLE_CLIENT_BACKPRESSURE); this.maxCellSize = conf.getLong(HBASE_MAX_CELL_SIZE_KEY, DEFAULT_MAX_CELL_SIZE); - - boolean unassignForFNFE = - conf.getBoolean(HREGION_UNASSIGN_FOR_FNFE, DEFAULT_HREGION_UNASSIGN_FOR_FNFE); - if (unassignForFNFE) { - this.regionUnassigner = new RegionUnassigner(rsServices, fs.getRegionInfo()); - } else { - this.regionUnassigner = null; - } } void setHTableSpecificConf() { @@ -5993,20 +5980,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } } - private void handleFileNotFound(Throwable fnfe) { - // Try reopening the region since we have lost some storefiles. - // See HBASE-17712 for more details. - LOG.warn("A store file got lost, so close and reopen region", fnfe); - if (regionUnassigner != null) { - regionUnassigner.unassign(); - } - } - private IOException handleException(List instantiatedScanners, Throwable t) { - if (t instanceof FileNotFoundException) { - handleFileNotFound(t); - } // remove scaner read point before throw the exception scannerReadPoints.remove(this); if (storeHeap != null) { @@ -6089,19 +6064,14 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi throw new UnknownScannerException("Scanner was closed"); } boolean moreValues = false; - try { - if (outResults.isEmpty()) { - // Usually outResults is empty. This is true when next is called - // to handle scan or get operation. - moreValues = nextInternal(outResults, scannerContext); - } else { - List tmpList = new ArrayList(); - moreValues = nextInternal(tmpList, scannerContext); - outResults.addAll(tmpList); - } - } catch (FileNotFoundException e) { - handleFileNotFound(e); - throw e; + if (outResults.isEmpty()) { + // Usually outResults is empty. This is true when next is called + // to handle scan or get operation. + moreValues = nextInternal(outResults, scannerContext); + } else { + List tmpList = new ArrayList(); + moreValues = nextInternal(tmpList, scannerContext); + outResults.addAll(tmpList); } // If the size limit was reached it means a partial Result is being returned. Returning a @@ -6541,9 +6511,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi if (this.joinedHeap != null) { result = this.joinedHeap.requestSeek(kv, true, true) || result; } - } catch (FileNotFoundException e) { - handleFileNotFound(e); - throw e; } finally { closeRegionOperation(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionUnassigner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionUnassigner.java deleted file mode 100644 index b347b4b568..0000000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionUnassigner.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.regionserver; - -import java.io.IOException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.classification.InterfaceAudience; - -/** - * Used to unssign a region when we hit FNFE. - */ -@InterfaceAudience.Private -class RegionUnassigner { - - private static final Log LOG = LogFactory.getLog(RegionUnassigner.class); - - private final RegionServerServices rsServices; - - private final HRegionInfo regionInfo; - - private boolean unassigning = false; - - RegionUnassigner(RegionServerServices rsServices, HRegionInfo regionInfo) { - this.rsServices = rsServices; - this.regionInfo = regionInfo; - } - - synchronized void unassign() { - if (unassigning) { - return; - } - unassigning = true; - new Thread("Unassign-" + regionInfo) { - - @Override - public void run() { - LOG.info("Unassign " + regionInfo.getRegionNameAsString()); - try { - rsServices.unassign(regionInfo.getRegionName()); - } catch (IOException e) { - LOG.warn("Unassigned " + regionInfo.getRegionNameAsString() + " failed", e); - } finally { - synchronized (RegionUnassigner.this) { - unassigning = false; - } - } - } - }.start(); - } -} -- 2.13.4