From b0c406da079ee0e8acd003f8db4fb3ce123b6f8a Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Sun, 3 Nov 2013 05:11:20 +0000 Subject: [PATCH] HBASE-8942 DFS errors during a read operation (get/scan), may cause write outliers git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1538317 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop/hbase/regionserver/HStore.java | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 19be8029043..5f65a26821e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -1678,21 +1678,16 @@ public class HStore implements Store { ////////////////////////////////////////////////////////////////////////////// @Override - public KeyValueScanner getScanner(Scan scan, - final NavigableSet targetCols, long readPt) throws IOException { - lock.readLock().lock(); - try { - KeyValueScanner scanner = null; - if (this.getCoprocessorHost() != null) { - scanner = this.getCoprocessorHost().preStoreScannerOpen(this, scan, targetCols); - } - if (scanner == null) { - scanner = new StoreScanner(this, getScanInfo(), scan, targetCols, readPt); - } - return scanner; - } finally { - lock.readLock().unlock(); + public KeyValueScanner getScanner(Scan scan, final NavigableSet targetCols, long readPt) + throws IOException { + KeyValueScanner scanner = null; + if (this.getCoprocessorHost() != null) { + scanner = this.getCoprocessorHost().preStoreScannerOpen(this, scan, targetCols); } + if (scanner == null) { + scanner = new StoreScanner(this, getScanInfo(), scan, targetCols, readPt); + } + return scanner; } @Override