You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2021/09/11 05:35:32 UTC

[zookeeper] branch master updated: ZOOKEEPER-4350: improve the method: QuorumOracleMaj#overrideQuorumDecision

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ce4c3d5  ZOOKEEPER-4350: improve the method: QuorumOracleMaj#overrideQuorumDecision
ce4c3d5 is described below

commit ce4c3d52e0dfb59ee758b77450ae13b196488c95
Author: gopalbala <ba...@gmail.com>
AuthorDate: Sat Sep 11 13:34:36 2021 +0800

    ZOOKEEPER-4350: improve the method: QuorumOracleMaj#overrideQuorumDecision
    
    ZOOKEEPER-4350 - improve the method: QuorumOracleMaj#overrideQuorumDecision
    
    Author: gopalbala <ba...@gmail.com>
    
    Reviewers: maoling <ma...@apache.org>
    
    Closes #1750 from gopalbala/ZOOKEEPER-4350
---
 .../apache/zookeeper/server/quorum/flexible/QuorumOracleMaj.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumOracleMaj.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumOracleMaj.java
index 0845b80..01f3a82 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumOracleMaj.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumOracleMaj.java
@@ -115,11 +115,7 @@ public class QuorumOracleMaj extends QuorumMaj {
 
     @Override
     public boolean overrideQuorumDecision(List<LearnerHandler> forwardingFollowers) {
-        if (updateNeedOracle(forwardingFollowers) && askOracle()) {
-            return true;
-        } else {
-            return false;
-        }
+        return updateNeedOracle(forwardingFollowers) && askOracle();
     }
 
     @Override