Allow the peer delivery client to select between the Deliverer or BFT…

…Delivere

Signed-off-by: Emil Elizarov <emil.elizarov@ibm.com>

core/deliverservice/config.go

@@ -9,6 +9,7 @@ package deliverservice
 import (
 	"encoding/pem"
 	"os"
+	"slices"
 	"time"
 
 	"github.com/hyperledger/fabric/common/deliverclient/orderers"
@@ -25,6 +26,7 @@ const (
 	DefaultConnectionTimeout           = time.Second * 3
 	DefaultBlockCensorshipTimeoutKey   = time.Second * 30
 	DefaultMinimalReconnectInterval    = time.Millisecond * 100
+	DefaultPolicy                      = "cluster"
 )
 
 // DeliverServiceConfig is the struct that defines the deliverservice configuration.
@@ -52,6 +54,7 @@ type DeliverServiceConfig struct {
 	// OrdererEndpointOverrides is a map of orderer addresses which should be
 	// re-mapped to a different orderer endpoint.
 	OrdererEndpointOverrides map[string]*orderers.Endpoint
+	Policy                   string
 }
 
 type AddressOverride struct {
@@ -207,4 +210,20 @@ func (c *DeliverServiceConfig) loadDeliverServiceConfig() {
 	}
 
 	c.OrdererEndpointOverrides = overridesMap
+
+	policyKey := "peer.deliveryclient.policy"
+	policyMissing := !viper.IsSet(policyKey)
+	policy := DefaultPolicy
+	if policyMissing {
+		logger.Infof("%s is not set, defaulting to %s.", policyKey, policy)
+	} else {
+		policy = viper.GetString(policyKey)
+		validPolicies := []string{"simple", "cluster"}
+		if !slices.Contains(validPolicies, policy) {
+			logger.Warnf("%s is set to \"%s\" which is not valid policy, defaulting to \"%s\"", policyKey, policy, DefaultPolicy)
+			policy = DefaultPolicy
+		}
+	}
+
+	c.Policy = policy
 }

core/deliverservice/config_test.go

@@ -89,6 +89,7 @@ func TestGlobalConfig(t *testing.T) {
 	viper.Set("peer.keepalive.deliveryClient.timeout", "2s")
 	viper.Set("peer.deliveryclient.blockCensorshipTimeoutKey", "40s")
 	viper.Set("peer.deliveryclient.minimalReconnectInterval", "110ms")
+	viper.Set("peer.deliveryclient.policy", "simple")
 
 	coreConfig := deliverservice.GlobalConfig()
 
@@ -110,6 +111,7 @@ func TestGlobalConfig(t *testing.T) {
 		SecOpts: comm.SecureOptions{
 			UseTLS: true,
 		},
+		Policy: "simple",
 	}
 
 	require.Equal(t, expectedConfig, coreConfig)
@@ -130,6 +132,7 @@ func TestGlobalConfigDefault(t *testing.T) {
 		KeepaliveOptions:            comm.DefaultKeepaliveOptions,
 		BlockCensorshipTimeoutKey:   deliverservice.DefaultBlockCensorshipTimeoutKey,
 		MinimalReconnectInterval:    deliverservice.DefaultMinimalReconnectInterval,
+		Policy:                      deliverservice.DefaultPolicy,
 	}
 
 	require.Equal(t, expectedConfig, coreConfig)
@@ -265,6 +268,7 @@ func TestGlobalConfigCheckDefaultIsSet(t *testing.T) {
 		KeepaliveOptions:            comm.DefaultKeepaliveOptions,
 		BlockCensorshipTimeoutKey:   deliverservice.DefaultBlockCensorshipTimeoutKey,
 		MinimalReconnectInterval:    deliverservice.DefaultMinimalReconnectInterval,
+		Policy:                      deliverservice.DefaultPolicy,
 	}
 
 	require.Equal(t, coreConfig, expectedConfig)

core/deliverservice/deliveryclient.go

@@ -128,14 +128,25 @@ func (d *deliverServiceImpl) StartDeliverForChannel(chainID string, ledgerInfo b
 		return errors.Errorf("failed to create block deliverer for channel `%s`, missing OrdererConfig", chainID)
 	}
 
+	createCftDeliverer := false
 	switch ct := oc.ConsensusType(); ct {
 	case "etcdraft":
-		d.blockDeliverer, err = d.createBlockDelivererCFT(chainID, ledgerInfo)
+		createCftDeliverer = true
 	case "BFT":
-		d.blockDeliverer, err = d.createBlockDelivererBFT(chainID, ledgerInfo)
+		switch d.conf.DeliverServiceConfig.Policy {
+		case "cluster", "":
+			d.blockDeliverer, err = d.createBlockDelivererBFT(chainID, ledgerInfo)
+		case "simple":
+			createCftDeliverer = true
+		default:
+			err = errors.Errorf("unexpected delivey service policy: `%s`", d.conf.DeliverServiceConfig.Policy)
+		}
 	default:
 		err = errors.Errorf("unexpected consensus type: `%s`", ct)
 	}
+	if createCftDeliverer {
+		d.blockDeliverer, err = d.createBlockDelivererCFT(chainID, ledgerInfo)
+	}
 
 	if err != nil {
 		return err

sampleconfig/core.yaml

@@ -403,6 +403,12 @@ peer:
         #    to:
         #    caCertsFile:
 
+        # Determines which delivery client will be used when consensus type is "BFT"
+        # (when consensus type is "etcdraft" this key is ignored).
+        # "simple" - use CFT deliverer
+        # "cluster" - use BFT deliverer
+        policy: cluster
+
     # Type for the local MSP - by default it's of type bccsp
     localMspType: bccsp