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

HBASE-709 Deadlock while rolling WAL-log while finishing flush 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@671711 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-06-26 03:29:02 +00:00
parent e00d548bcc
commit b33ad41da3
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -67,6 +67,7 @@ Hbase Change Log
HBASE-701 Showing bytes in log when should be String HBASE-701 Showing bytes in log when should be String
HBASE-702 deleteall doesn't HBASE-702 deleteall doesn't
HBASE-704 update new shell docs and commands on help menu HBASE-704 update new shell docs and commands on help menu
HBASE-709 Deadlock while rolling WAL-log while finishing flush
IMPROVEMENTS IMPROVEMENTS

20
src/java/org/apache/hadoop/hbase/regionserver/HLog.java
View File

@ -393,24 +393,22 @@ public class HLog implements HConstants {
try { try {
this.writer.append(logKey, logEdit); this.writer.append(logKey, logEdit);
} catch (IOException e) { } catch (IOException e) {
LOG.error("Could not append to log. Opening new log. Exception: ", e); LOG.fatal("Could not append. Requesting close of log", e);
rollWriter(); requestLogRoll();
try { throw e;
this.writer.append(logKey, logEdit);
} catch (IOException e2) {
LOG.fatal("Could not append to log the second time because " +
e2.toString() + ", aborting.");
throw e2;
}
} }
this.numEntries++; this.numEntries++;
} }
} }
if (this.numEntries > this.maxlogentries) { if (this.numEntries > this.maxlogentries) {
if (listener != null) { requestLogRoll();
listener.logRollRequested();
} }
} }
private void requestLogRoll() {
if (this.listener != null) {
this.listener.logRollRequested();
}
} }
/** @return How many items have been added to the log */ /** @return How many items have been added to the log */