Add validation to setting cluster.brick-multiplex cluster option.

Discard all garbage strings and allow only "on", "yes", "true", "enable", "1" OR
"off", "no", "false", "disable", "0"

Signed-off-by: Vishal Pandey <[email protected]>

Author: vpandey-RH

e2e/brickmux_test.go

@@ -27,12 +27,11 @@ func TestBrickMux(t *testing.T) {
 	r.Nil(err)
 	r.NotNil(client)
 
-	// Turn on brick mux cluster option
 	optReq := api.ClusterOptionReq{
-		Options: map[string]string{"cluster.brick-multiplex": "on"},
+		Options: map[string]string{"cluster.brick-multiplex": "invalidValue"},
 	}
 	err = client.ClusterOptionSet(optReq)
-	r.Nil(err)
+	r.NotNil(err)
 
 	// Create a 1 x 3 volume
 	var brickPaths []string

glusterd2/brickmux/option.go

@@ -27,6 +27,12 @@ func Enabled() (bool, error) {
 
 // validateOption validates brick mux options
 func validateOption(option, value string) error {
+	if option == "cluster.brick-multiplex" {
+		_, err := options.StringToBoolean(value)
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

glusterd2/options/cluster.go

@@ -30,7 +30,7 @@ var ClusterOptMap = map[string]*ClusterOption{
 	"cluster.shared-storage":         {"cluster.shared-storage", "off", OptionTypeBool, nil},
 	"cluster.op-version":             {"cluster.op-version", strconv.Itoa(gdctx.OpVersion), OptionTypeInt, nil},
 	"cluster.max-op-version":         {"cluster.max-op-version", strconv.Itoa(gdctx.OpVersion), OptionTypeInt, nil},
-	"cluster.brick-multiplex":        {"cluster.brick-multiplex", "off", OptionTypeBool, nil},
+	"cluster.brick-multiplex":        {"cluster.brick-multiplex", "on", OptionTypeBool, nil},
 	"cluster.max-bricks-per-process": {"cluster.max-bricks-per-process", "0", OptionTypeInt, nil},
 	"cluster.localtime-logging":      {"cluster.localtime-logging", "off", OptionTypeBool, nil},
 }