[bookkeeper] 01/02: Journal: Fix journal write queue so it decrements properly.

[si...@apache.org]

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

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

commit 8a895befe9e25f340ae351b6ab73eeffd592f62d
Author: Dustin <dc...@salesforce.com>
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 <dc...@salesforce.com>
    
    Reviewers: Sijie Guo <si...@apache.org>
    
    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 11468d1..d03e65d 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
@@ -388,7 +388,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) {
@@ -408,8 +407,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
sijie@apache.org.