Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11551 BucketCache.run() doesn't handle exceptions correctly (Ted Yu)

This commit is contained in:
Ted Yu 2014-07-24 00:59:10 +00:00
parent 60f5378895
commit 75c94c6bb5
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
View File

@ -688,16 +688,20 @@ public class BucketCache implements BlockCache, HeapSize {
try { try {
while (cacheEnabled && writerEnabled) { while (cacheEnabled && writerEnabled) {
try { try {
// Blocks try {
entries.add(inputQueue.take()); // Blocks
inputQueue.drainTo(entries); entries.add(inputQueue.take());
synchronized (cacheWaitSignals[threadNO]) { inputQueue.drainTo(entries);
cacheWaitSignals[threadNO].notifyAll(); synchronized (cacheWaitSignals[threadNO]) {
cacheWaitSignals[threadNO].notifyAll();
}
} catch (InterruptedException ie) {
if (!cacheEnabled) break;
} }
} catch (InterruptedException ie) { doDrain(entries);
if (!cacheEnabled) break; } catch (Exception ioe) {
LOG.error("WriterThread encountered error", ioe);
} }
doDrain(entries);
} }
} catch (Throwable t) { } catch (Throwable t) {
LOG.warn("Failed doing drain", t); LOG.warn("Failed doing drain", t);