local volume: add options in controller and replica commands

Longhorn 3957 Signed-off-by: Derek Su <derek.su@suse.com>
longhorn · Nov 25, 2022 · f0a9228 · f0a9228
1 parent 3b1e359
commit f0a9228
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/app/cmd/controller.go b/app/cmd/controller.go
@@ -64,6 +64,11 @@ func ControllerCmd() cli.Command {
 				Hidden: false,
 				Usage:  "In seconds. Timeout between engine and replica(s)",
 			},
+			cli.StringFlag{
+				Name:  "data-server-protocol",
+				Value: "tcp",
+				Usage: "Specify the data-server protocol. Available options are \"tcp\" and \"unix\"",
+			},
 		},
 		Action: func(c *cli.Context) {
 			if err := startController(c); err != nil {
@@ -114,6 +119,8 @@ func startController(c *cli.Context) error {
 	engineReplicaTimeout = controller.DetermineEngineReplicaTimeout(engineReplicaTimeout)
 	iscsiTargetRequestTimeout := controller.DetermineIscsiTargetRequestTimeout(engineReplicaTimeout)
 
+	dataServerProtocol := c.String("data-server-protocol")
+
 	factories := map[string]types.BackendFactory{}
 	for _, backend := range backends {
 		switch backend {
@@ -138,7 +145,7 @@ func startController(c *cli.Context) error {
 	logrus.Infof("Creating controller %v with iSCSI target request timeout %v and engine to replica(s) timeout %v",
 		name, iscsiTargetRequestTimeout, engineReplicaTimeout)
 	control := controller.NewController(name, dynamic.New(factories), frontend, isUpgrade, disableRevCounter, salvageRequested,
-		iscsiTargetRequestTimeout, engineReplicaTimeout)
+		iscsiTargetRequestTimeout, engineReplicaTimeout, types.DataServerProtocol(dataServerProtocol))
 
 	// need to wait for Shutdown() completion
 	control.ShutdownWG.Add(1)

diff --git a/app/cmd/replica.go b/app/cmd/replica.go
@@ -19,6 +19,7 @@ import (
 	"github.com/longhorn/longhorn-engine/pkg/backingfile"
 	"github.com/longhorn/longhorn-engine/pkg/replica"
 	replicarpc "github.com/longhorn/longhorn-engine/pkg/replica/rpc"
+	"github.com/longhorn/longhorn-engine/pkg/types"
 	"github.com/longhorn/longhorn-engine/pkg/util"
 	diskutil "github.com/longhorn/longhorn-engine/pkg/util/disk"
 	"github.com/longhorn/longhorn-engine/proto/ptypes"
@@ -61,6 +62,15 @@ func ReplicaCmd() cli.Command {
 				Hidden: false,
 				Usage:  "To disable revision counter for every write",
 			},
+			cli.StringFlag{
+				Name:  "volume-name",
+				Value: "",
+			},
+			cli.StringFlag{
+				Name:  "data-server-protocol",
+				Value: "tcp",
+				Usage: "Specify the data-server protocol. Available options are \"tcp\" and \"unix\"",
+			},
 		},
 		Action: func(c *cli.Context) {
 			if err := startReplica(c); err != nil {
@@ -99,7 +109,11 @@ func startReplica(c *cli.Context) error {
 		}
 	}
 
-	controlAddress, dataAddress, syncAddress, syncPort, err := util.ParseAddresses(address)
+	volumeName := c.String("volume-name")
+	dataServerProtocol := c.String("data-server-protocol")
+
+	controlAddress, dataAddress, syncAddress, syncPort, err :=
+		util.GetAddresses(volumeName, address, types.DataServerProtocol(dataServerProtocol))
 	if err != nil {
 		return err
 	}
@@ -127,7 +141,7 @@ func startReplica(c *cli.Context) error {
 	}()
 
 	go func() {
-		rpcServer := replicarpc.NewDataServer(dataAddress, s)
+		rpcServer := replicarpc.NewDataServer(types.DataServerProtocol(dataServerProtocol), dataAddress, s)
 		logrus.Infof("Listening on data server %s", dataAddress)
 		err := rpcServer.ListenAndServe()
 		logrus.Warnf("Replica rest server at %v is down: %v", dataAddress, err)