You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/02/22 07:32:01 UTC

[bookkeeper] branch branch-4.6 updated (eeaf316 -> 3ca95a1)

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

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


    from eeaf316  Propogate exception when bookie shutdown fails
     new 8a895be  Journal: Fix journal write queue so it decrements properly.
     new 3ca95a1  DefaultSpeculativeRequestExecutionPolicy: fix logger instantiation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/bookkeeper/bookie/Journal.java            | 3 +--
 .../bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.

[bookkeeper] 02/02: DefaultSpeculativeRequestExecutionPolicy: fix logger instantiation

Posted by 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 3ca95a130d96906d994c8e93c2653dd5c162bb4e
Author: Samuel Just <sj...@salesforce.com>
AuthorDate: Thu Dec 21 21:46:33 2017 -0800

    DefaultSpeculativeRequestExecutionPolicy: fix logger instantiation
    
    Signed-off-by: Samuel Just <sjustsalesforce.com>
    
    Author: Samuel Just <sj...@salesforce.com>
    
    Reviewers: Sijie Guo <si...@apache.org>
    
    This closes #911 from athanatos/forupstream/small-fixes-1/logger
---
 .../bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
index 3c3daba..9785566 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultSpeculativeRequestExecutionPolicy.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * are between {@code firstSpeculativeRequestTimeout} and {@code maxSpeculativeRequestTimeout}.
  */
 public class DefaultSpeculativeRequestExecutionPolicy implements SpeculativeRequestExecutionPolicy {
-    private static final Logger LOG = LoggerFactory.getLogger(PendingReadOp.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultSpeculativeRequestExecutionPolicy.class);
     final int firstSpeculativeRequestTimeout;
     final int maxSpeculativeRequestTimeout;
     final float backoffMultiplier;

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.

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

Posted by 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.