This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new c8b8267  Journal: Fix journal write queue so it decrements properly.
c8b8267 is described below

commit c8b8267abf6b0aefdc5f3eaae665330f3998b2cc
Author: Dustin <[email protected]>
AuthorDate: Thu Dec 21 21:53:02 2017 -0800

    Journal: Fix journal write queue so it decrements properly.
    
    (bug W-3169683)
    Signed-off-by: Dustin <dcastorsalesforce.com>
    
    Author: Dustin <[email protected]>
    
    Reviewers: Sijie Guo <[email protected]>
    
    This closes #912 from athanatos/forupstream/small-fixes-1/journal
---
 .../src/main/java/org/apache/bookkeeper/bookie/Journal.java            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 b979b27..1192fd9 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
@@ -440,7 +440,6 @@ public class Journal extends BookieCriticalThread 
implements CheckpointSource {
                 ForceWriteRequest req = null;
                 try {
                     req = forceWriteRequests.take();
-
                     // Force write the file and then notify the write 
completions
                     //
                     if (!req.isMarker) {
@@ -460,8 +459,8 @@ public class Journal extends BookieCriticalThread 
implements CheckpointSource {
                                 numReqInLastForceWrite = 0;
                             }
                         }
-                        numReqInLastForceWrite += 
req.process(shouldForceWrite);
                     }
+                    numReqInLastForceWrite += req.process(shouldForceWrite);
 
                     if (enableGroupForceWrites
                             // if its a marker we should switch back to 
flushing

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to