Repository: bookkeeper Updated Branches: refs/heads/branch-4.3 d17c46fc7 -> ee02679b3
BOOKKEEPER-838: ForceWriteThread::run() leaks âlogFile.close()â when interrupt comes (zhaijia via sijie) Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/3479802c Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/3479802c Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/3479802c Branch: refs/heads/branch-4.3 Commit: 3479802ce09436ae24d6c4bb42ab730a3249fc10 Parents: d17c46f Author: Sijie Guo <si...@apache.org> Authored: Sun Feb 22 23:19:57 2015 -0800 Committer: Sijie Guo <si...@apache.org> Committed: Sun Feb 22 23:19:57 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../src/main/java/org/apache/bookkeeper/bookie/Journal.java | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/3479802c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1e37013..72670ae 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,8 @@ Release 4.3.1 - unreleased BOOKKEEPER-814: clean up temp files that generated by test cases. (zhaijia via ivank) + BOOKKEEPER-838: ForceWriteThread::run() leaks âlogFile.close()â when interrupt comes (zhaijia via sijie) + IMPROVEMENTS: BOOKKEEPER-800: Expose whether a ledger is closed or not (ivank) http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/3479802c/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java ---------------------------------------------------------------------- diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java index ad48386..7384330 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java @@ -432,6 +432,7 @@ class Journal extends BookieCriticalThread implements CheckpointSource { LOG.error("ForceWrite thread interrupted", e); // close is idempotent if (null != req) { + req.shouldClose = true; req.closeFileIfNecessary(); } running = false;
