Implementing Flexible Raft with NWR

jraft-core/src/main/java/com/alipay/sofa/jraft/CliService.java

@@ -33,6 +33,17 @@
  */
 public interface CliService extends Lifecycle<CliOptions> {
 
+    /**
+     * Reset the size of the read or write factor of a raft group in flexible mode
+     *
+     * @param groupId      the raft group id
+     * @param conf         current configuration
+     * @param readFactor   read factor in flexible raft mode
+     * @param writeFactor  write factor in flexible raft mode
+     * @return operation status
+     */
+    Status resetFactor(final String groupId, final Configuration conf, final int readFactor, final int writeFactor);
+
     /**
      * Add a new peer into the replicating group which consists of |conf|.
      * return OK status when success.

jraft-core/src/main/java/com/alipay/sofa/jraft/JRaftUtils.java

@@ -25,6 +25,7 @@
 
 import com.alipay.sofa.jraft.conf.Configuration;
 import com.alipay.sofa.jraft.core.NodeImpl;
+import com.alipay.sofa.jraft.entity.BallotFactory;
 import com.alipay.sofa.jraft.entity.PeerId;
 import com.alipay.sofa.jraft.option.BootstrapOptions;
 import com.alipay.sofa.jraft.util.Endpoint;
@@ -112,6 +113,9 @@ public static Configuration getConfiguration(final String s) {
             return conf;
         }
         if (conf.parse(s)) {
+            conf.setEnableFlexible(false);
+            Quorum quorum = BallotFactory.buildMajorityQuorum(conf.size());
+            conf.setQuorum(quorum);
             return conf;
         }
         throw new IllegalArgumentException("Invalid conf str:" + s);

jraft-core/src/main/java/com/alipay/sofa/jraft/Node.java

@@ -219,6 +219,18 @@ public interface Node extends Lifecycle<NodeOptions>, Describer {
      */
     void changePeers(final Configuration newPeers, final Closure done);
 
+    /**
+     * This method can be called to reset the size of the read or write factor
+     *
+     * It should be noted that we cannot change the factory size while changing
+     * the number of cluster nodes.
+     *
+     * @param readFactor read factor for flexible raft
+     * @param writeFactor write factor for flexible raft
+     * @since 1.3.14
+     */
+    void resetFactor(final int readFactor, final int writeFactor, final Closure done);
+
     /**
      * Reset the configuration of this node individually, without any replication
      * to other peers before this node becomes the leader. This function is

jraft-core/src/main/java/com/alipay/sofa/jraft/Quorum.java

@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alipay.sofa.jraft;
+
+/**
+ *
+ * Quorum is used to display r and w during the operation of the raft cluster.
+ *
+ * @author Akai
+ */
+public class Quorum {
+    private int w;
+
+    private int r;
+
+    public Quorum(int w, int r) {
+        this.w = w;
+        this.r = r;
+    }
+
+    public int getW() {
+        return w;
+    }
+
+    public void setW(int w) {
+        this.w = w;
+    }
+
+    public int getR() {
+        return r;
+    }
+
+    public void setR(int r) {
+        this.r = r;
+    }
+
+    @Override
+    public String toString() {
+        return "Quorum{w=" + w + ", r=" + r + '}';
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + w;
+        result = 31 * result + r;
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Quorum) {
+            Quorum quorum = (Quorum) obj;
+            return quorum.getR() == this.getR() && quorum.getW() == this.getW();
+        }
+        return false;
+    }
+
+}

jraft-core/src/main/java/com/alipay/sofa/jraft/conf/Configuration.java

@@ -22,19 +22,23 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.alipay.sofa.jraft.entity.LogEntry;
 import com.alipay.sofa.jraft.entity.PeerId;
+import com.alipay.sofa.jraft.Quorum;
 import com.alipay.sofa.jraft.util.Copiable;
 import com.alipay.sofa.jraft.util.Requires;
 
 /**
  * A configuration with a set of peers.
  * @author boyan (boyan@alibaba-inc.com)
+ * @author Akai
  *
  * 2018-Mar-15 11:00:26 AM
  */
@@ -44,6 +48,14 @@ public class Configuration implements Iterable<PeerId>, Copiable<Configuration>
 
     private static final String   LEARNER_POSTFIX = "/learner";
 
+    private Quorum                quorum;
+
+    private int                   readFactor;
+
+    private int                   writeFactor;
+
+    private boolean               enableFlexible  = false;
+
     private List<PeerId>          peers           = new ArrayList<>();
 
     // use LinkedHashSet to keep insertion order.
@@ -68,16 +80,34 @@ public Configuration(final Iterable<PeerId> conf) {
      * @param conf configuration
      */
     public Configuration(final Configuration conf) {
-        this(conf.getPeers(), conf.getLearners());
+        this(conf.getPeers(), conf.getLearners(), conf.getQuorum(), conf.getReadFactor(), conf.getWriteFactor(), conf
+            .isEnableFlexible());
     }
 
     /**
      * Construct a Configuration instance with peers and learners.
      *
-     * @param conf     peers configuration
-     * @param learners learners
-     * @since 1.3.0
+     * @param conf              peers configuration
+     * @param learners          learners
+     * @param quorum            quorum
+     * @param readFactor        read factor
+     * @param writeFactor       write factor
+     * @param enableFlexible  enable flexible mode or not
+     * @since 1.3.14
      */
+    public Configuration(final Iterable<PeerId> conf, final Iterable<PeerId> learners, final Quorum quorum,
+                         final int readFactor, final int writeFactor, final boolean enableFlexible) {
+        Requires.requireNonNull(conf, "conf");
+        for (final PeerId peer : conf) {
+            this.peers.add(peer.copy());
+        }
+        addLearners(learners);
+        this.quorum = quorum;
+        this.readFactor = readFactor;
+        this.writeFactor = writeFactor;
+        this.enableFlexible = enableFlexible;
+    }
+
     public Configuration(final Iterable<PeerId> conf, final Iterable<PeerId> learners) {
         Requires.requireNonNull(conf, "conf");
         for (final PeerId peer : conf) {
@@ -86,6 +116,48 @@ public Configuration(final Iterable<PeerId> conf, final Iterable<PeerId> learner
         addLearners(learners);
     }
 
+    public Configuration fromEntry(LogEntry logEntry) {
+        Configuration conf = new Configuration(logEntry.getPeers());
+        conf.setEnableFlexible(logEntry.getEnableFlexible());
+        conf.setReadFactor(logEntry.getReadFactor());
+        conf.setWriteFactor(logEntry.getWriteFactor());
+        Quorum quorum = new Quorum(logEntry.getQuorum().getW(), logEntry.getQuorum().getR());
+        conf.setQuorum(quorum);
+        return conf;
+    }
+
+    public int getReadFactor() {
+        return readFactor;
+    }
+
+    public void setReadFactor(int readFactor) {
+        this.readFactor = readFactor;
+    }
+
+    public int getWriteFactor() {
+        return writeFactor;
+    }
+
+    public void setWriteFactor(int writeFactor) {
+        this.writeFactor = writeFactor;
+    }
+
+    public Quorum getQuorum() {
+        return this.quorum;
+    }
+
+    public void setQuorum(Quorum quorum) {
+        this.quorum = quorum;
+    }
+
+    public boolean isEnableFlexible() {
+        return enableFlexible;
+    }
+
+    public void setEnableFlexible(boolean enableFlexible) {
+        this.enableFlexible = enableFlexible;
+    }
+
     public void setLearners(final LinkedHashSet<PeerId> learners) {
         this.learners = learners;
     }
@@ -148,7 +220,7 @@ public List<PeerId> listLearners() {
 
     @Override
     public Configuration copy() {
-        return new Configuration(this.peers, this.learners);
+        return new Configuration(this);
     }
 
     /**
@@ -251,12 +323,28 @@ public boolean equals(final Object obj) {
         if (this.peers == null) {
             return other.peers == null;
         } else {
-            return this.peers.equals(other.peers);
+            return this.peers.equals(other.peers) && Objects.equals(this.quorum, other.quorum)
+                   && Objects.equals(this.readFactor, other.readFactor)
+                   && Objects.equals(this.writeFactor, other.writeFactor)
+                   && Objects.equals(this.enableFlexible, other.enableFlexible);
         }
     }
 
     @Override
     public String toString() {
+        StringBuilder sb = new StringBuilder(toBasicString());
+
+        sb.append(",enableFlexible:").append(enableFlexible);
+
+        sb.append(",readFactor:").append(readFactor).append(",writeFactor:").append(writeFactor);
+
+        if (Objects.nonNull(quorum)) {
+            sb.append(",quorum:").append(quorum);
+        }
+        return sb.toString();
+    }
+
+    public String toBasicString() {
         final StringBuilder sb = new StringBuilder();
         final List<PeerId> peers = listPeers();
         int i = 0;
@@ -278,7 +366,6 @@ public String toString() {
             }
             i++;
         }
-
         return sb.toString();
     }
 
@@ -311,9 +398,9 @@ public boolean parse(final String conf) {
     }
 
     /**
-     *  Get the difference between |*this| and |rhs|
-     *  |included| would be assigned to |*this| - |rhs|
-     *  |excluded| would be assigned to |rhs| - |*this|
+     * Get the difference between |*this| and |rhs|
+     * |included| would be assigned to |*this| - |rhs|
+     * |excluded| would be assigned to |rhs| - |*this|
      */
     public void diff(final Configuration rhs, final Configuration included, final Configuration excluded) {
         included.peers = new ArrayList<>(this.peers);

jraft-core/src/main/java/com/alipay/sofa/jraft/core/BallotBox.java

@@ -20,6 +20,8 @@
 
 import javax.annotation.concurrent.ThreadSafe;
 
+import com.alipay.sofa.jraft.entity.Ballot;
+import com.alipay.sofa.jraft.entity.PeerId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,8 +30,6 @@
 import com.alipay.sofa.jraft.Lifecycle;
 import com.alipay.sofa.jraft.closure.ClosureQueue;
 import com.alipay.sofa.jraft.conf.Configuration;
-import com.alipay.sofa.jraft.entity.Ballot;
-import com.alipay.sofa.jraft.entity.PeerId;
 import com.alipay.sofa.jraft.option.BallotBoxOptions;
 import com.alipay.sofa.jraft.util.Describer;
 import com.alipay.sofa.jraft.util.OnlyForTest;
@@ -114,12 +114,13 @@ public boolean commitAt(final long firstLogIndex, final long lastLogIndex, final
             final long startAt = Math.max(this.pendingIndex, firstLogIndex);
             Ballot.PosHint hint = new Ballot.PosHint();
             for (long logIndex = startAt; logIndex <= lastLogIndex; logIndex++) {
-                final Ballot bl = this.pendingMetaQueue.get((int) (logIndex - this.pendingIndex));
-                hint = bl.grant(peer, hint);
-                if (bl.isGranted()) {
+                final Ballot ballot = this.pendingMetaQueue.get((int) (logIndex - this.pendingIndex));
+                hint = ballot.grant(peer, hint);
+                if (ballot.isGranted()) {
                     lastCommittedIndex = logIndex;
                 }
             }
+
             if (lastCommittedIndex == 0) {
                 return true;
             }
@@ -198,8 +199,8 @@ public boolean resetPendingIndex(final long newPendingIndex) {
      * @return          returns true on success
      */
     public boolean appendPendingTask(final Configuration conf, final Configuration oldConf, final Closure done) {
-        final Ballot bl = new Ballot();
-        if (!bl.init(conf, oldConf)) {
+        final Ballot ballot = new Ballot();
+        if (!ballot.init(conf, oldConf)) {
             LOG.error("Fail to init ballot.");
             return false;
         }
@@ -209,7 +210,7 @@ public boolean appendPendingTask(final Configuration conf, final Configuration o
                 LOG.error("Node {} fail to appendingTask, pendingIndex={}.", this.opts.getNodeId(), this.pendingIndex);
                 return false;
             }
-            this.pendingMetaQueue.add(bl);
+            this.pendingMetaQueue.add(ballot);
             this.closureQueue.appendPendingClosure(done);
             return true;
         } finally {