bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject bookkeeper git commit: BOOKKEEPER-838: ForceWriteThread::run() leaks “logFile.close()” when interrupt comes (zhaijia via sijie)
Date Mon, 23 Feb 2015 07:12:32 GMT
Repository: bookkeeper
Updated Branches:
  refs/heads/master afbab15ad -> 8b23bd30c


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/8b23bd30
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/8b23bd30
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/8b23bd30

Branch: refs/heads/master
Commit: 8b23bd30c5e7388e91f650615671d754a9ee2727
Parents: afbab15
Author: Sijie Guo <sijie@apache.org>
Authored: Sun Feb 22 23:11:31 2015 -0800
Committer: Sijie Guo <sijie@apache.org>
Committed: Sun Feb 22 23:11:31 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/8b23bd30/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f231cc8..8ccb6a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,8 @@ Trunk (unreleased changes)
 
       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/8b23bd30/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;


Mime
View raw message