HBASE-864 Deadlock in regionserver
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@691710 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
65852deff9
commit
d49952f979
|
@ -55,6 +55,7 @@ Release 0.18.0 - Unreleased
|
|||
(Billy Pearson via Stack)
|
||||
HBASE-832 Problem with row keys beginnig with characters < than ',' and
|
||||
the region location cache
|
||||
HBASE-864 Deadlock in regionserver
|
||||
|
||||
IMPROVEMENTS
|
||||
HBASE-801 When a table haven't disable, shell could response in a "user
|
||||
|
|
|
@ -166,6 +166,7 @@ class Flusher extends Thread implements FlushRequester {
|
|||
flushQueue.remove(region);
|
||||
}
|
||||
lock.lock();
|
||||
}
|
||||
try {
|
||||
// See comment above for removeFromQueue on why we do not
|
||||
// compact if removeFromQueue is true. Note that region.flushCache()
|
||||
|
@ -183,8 +184,8 @@ class Flusher extends Thread implements FlushRequester {
|
|||
server.abort();
|
||||
return false;
|
||||
} catch (IOException ex) {
|
||||
LOG.error("Cache flush failed" +
|
||||
(region != null ? (" for region " + region.getRegionName()) : ""),
|
||||
LOG.error("Cache flush failed"
|
||||
+ (region != null ? (" for region " + region.getRegionName()) : ""),
|
||||
RemoteExceptionHandler.checkIOException(ex));
|
||||
if (!server.checkFileSystem()) {
|
||||
return false;
|
||||
|
@ -192,7 +193,7 @@ class Flusher extends Thread implements FlushRequester {
|
|||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue