[FAB-11990] create raft chain with channel configs

Propagate Raft algorithm parameters from channel configuration into Raft
chain instance.

Change-Id: I8fe53dc8f3bdd98f7d2cb3c27e446688ca1c636e
Signed-off-by: Artem Barger <bartem@il.ibm.com>

Author: C0rWin

orderer/consensus/etcdraft/consenter.go

@@ -94,6 +94,11 @@ func (c *Consenter) HandleChain(support consensus.ConsenterSupport, metadata *co
 	if err := proto.Unmarshal(support.SharedConfig().ConsensusMetadata(), m); err != nil {
 		return nil, errors.Wrap(err, "failed to unmarshal consensus metadata")
 	}
+
+	if m.Options == nil {
+		return nil, errors.New("etcdraft options have not been provided")
+	}
+
 	id, err := c.detectSelfID(m)
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -110,12 +115,11 @@ func (c *Consenter) HandleChain(support consensus.ConsenterSupport, metadata *co
 		Storage: raft.NewMemoryStorage(),
 		Logger:  c.Logger,
 
-		// TODO make options for raft configurable via channel configs
-		TickInterval:    100 * time.Millisecond,
-		ElectionTick:    10,
-		HeartbeatTick:   1,
-		MaxInflightMsgs: 256,
-		MaxSizePerMsg:   1024 * 1024, // This could potentially be deduced from max block size
+		TickInterval:    time.Duration(m.Options.TickInterval) * time.Millisecond,
+		ElectionTick:    int(m.Options.ElectionTick),
+		HeartbeatTick:   int(m.Options.HeartbeatTick),
+		MaxInflightMsgs: int(m.Options.MaxInflightMsgs),
+		MaxSizePerMsg:   m.Options.MaxSizePerMsg,
 
 		Peers: peers,
 	}

orderer/consensus/etcdraft/consenter_test.go

@@ -103,6 +103,13 @@ var _ = Describe("Consenter", func() {
 			Consenters: []*etcdraftproto.Consenter{
 				{ServerTlsCert: certBytes},
 			},
+			Options: &etcdraftproto.Options{
+				TickInterval:    100,
+				ElectionTick:    10,
+				HeartbeatTick:   1,
+				MaxInflightMsgs: 256,
+				MaxSizePerMsg:   1048576,
+			},
 		}
 		metadata := utils.MarshalOrPanic(m)
 		support.SharedConfigReturns(&mockconfig.Orderer{ConsensusMetadataVal: metadata})
@@ -121,6 +128,13 @@ var _ = Describe("Consenter", func() {
 			Consenters: []*etcdraftproto.Consenter{
 				{ServerTlsCert: []byte("cert.orderer1.org1")},
 			},
+			Options: &etcdraftproto.Options{
+				TickInterval:    100,
+				ElectionTick:    10,
+				HeartbeatTick:   1,
+				MaxInflightMsgs: 256,
+				MaxSizePerMsg:   1048576,
+			},
 		}
 		metadata := utils.MarshalOrPanic(m)
 		support.SharedConfigReturns(&mockconfig.Orderer{ConsensusMetadataVal: metadata})
@@ -131,6 +145,23 @@ var _ = Describe("Consenter", func() {
 		Expect(chain).To(BeNil())
 		Expect(err).To(MatchError("failed to detect own Raft ID because no matching certificate found"))
 	})
+
+	It("fails to handle chain if etcdraft options have not been provided", func() {
+		m := &etcdraftproto.Metadata{
+			Consenters: []*etcdraftproto.Consenter{
+				{ServerTlsCert: []byte("cert.orderer1.org1")},
+			},
+		}
+		metadata := utils.MarshalOrPanic(m)
+		support.SharedConfigReturns(&mockconfig.Orderer{ConsensusMetadataVal: metadata})
+
+		consenter := newConsenter(chainGetter)
+
+		chain, err := consenter.HandleChain(support, nil)
+		Expect(chain).To(BeNil())
+		Expect(err).To(MatchError("etcdraft options have not been provided"))
+	})
+
 })
 
 func newConsenter(chainGetter *mocks.ChainGetter) *etcdraft.Consenter {

protos/orderer/etcdraft/configuration.pb.go

@@ -29,7 +29,7 @@ message Consenter {
 // Options to be specified for all the etcd/raft nodes. These can be modified on a
 // per-channel basis.
 message Options {
-	uint32 tick_interval = 1; // specified in miliseconds
+	uint64 tick_interval = 1; // specified in miliseconds
 	uint32 election_tick = 2;
 	uint32 heartbeat_tick = 3;
 	uint32 max_inflight_msgs = 4;