[force] add force flag on start/stop/restart command

Author: jackblack369

cli/command/restart.go

@@ -25,6 +25,8 @@
 package command
 
 import (
+	"fmt"
+
 	"github.com/dingodb/curveadm/cli/cli"
 	"github.com/dingodb/curveadm/internal/configure/topology"
 	"github.com/dingodb/curveadm/internal/errno"
@@ -41,9 +43,10 @@ var (
 )
 
 type restartOptions struct {
-	id   string
-	role string
-	host string
+	id    string
+	role  string
+	host  string
+	force bool
 }
 
 func NewRestartCommand(curveadm *cli.CurveAdm) *cobra.Command {
@@ -66,6 +69,7 @@ func NewRestartCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags.StringVar(&options.id, "id", "*", "Specify service id")
 	flags.StringVar(&options.role, "role", "*", "Specify service role")
 	flags.StringVar(&options.host, "host", "*", "Specify service host")
+	flags.BoolVarP(&options.force, "force", "f", false, "Never prompt")
 
 	return cmd
 }
@@ -106,6 +110,12 @@ func runRestart(curveadm *cli.CurveAdm, options restartOptions) error {
 		return err
 	}
 
+	// 3) force restart
+	if options.force {
+		fmt.Print(tui.PromptRestartService(options.id, options.role, options.host))
+		return pb.Run()
+	}
+
 	// 3) confirm by user
 	if pass := tui.ConfirmYes(tui.PromptRestartService(options.id, options.role, options.host)); !pass {
 		curveadm.WriteOut(tui.PromptCancelOpetation("restart service"))

cli/command/start.go

@@ -25,6 +25,8 @@
 package command
 
 import (
+	"fmt"
+
 	"github.com/dingodb/curveadm/cli/cli"
 	"github.com/dingodb/curveadm/internal/configure/topology"
 	"github.com/dingodb/curveadm/internal/errno"
@@ -41,9 +43,10 @@ var (
 )
 
 type startOptions struct {
-	id   string
-	role string
-	host string
+	id    string
+	role  string
+	host  string
+	force bool
 }
 
 func checkCommonOptions(curveadm *cli.CurveAdm, id, role, host string) error {
@@ -88,6 +91,7 @@ func NewStartCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags.StringVar(&options.id, "id", "*", "Specify service id")
 	flags.StringVar(&options.role, "role", "*", "Specify service role")
 	flags.StringVar(&options.host, "host", "*", "Specify service host")
+	flags.BoolVarP(&options.force, "force", "f", false, "Never prompt")
 
 	return cmd
 }
@@ -128,6 +132,12 @@ func runStart(curveadm *cli.CurveAdm, options startOptions) error {
 		return err
 	}
 
+	// 3) force start
+	if options.force {
+		fmt.Print(tui.PromptStartService(options.id, options.role, options.host))
+		return pb.Run()
+	}
+
 	// 3) confirm by user
 	if pass := tui.ConfirmYes(tui.PromptStartService(options.id, options.role, options.host)); !pass {
 		curveadm.WriteOut(tui.PromptCancelOpetation("start service"))

cli/command/stop.go

@@ -25,6 +25,8 @@
 package command
 
 import (
+	"fmt"
+
 	"github.com/dingodb/curveadm/cli/cli"
 	"github.com/dingodb/curveadm/internal/configure/topology"
 	"github.com/dingodb/curveadm/internal/errno"
@@ -41,9 +43,10 @@ var (
 )
 
 type stopOptions struct {
-	id   string
-	role string
-	host string
+	id    string
+	role  string
+	host  string
+	force bool
 }
 
 func NewStopCommand(curveadm *cli.CurveAdm) *cobra.Command {
@@ -66,6 +69,7 @@ func NewStopCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags.StringVar(&options.id, "id", "*", "Specify service id")
 	flags.StringVar(&options.role, "role", "*", "Specify service role")
 	flags.StringVar(&options.host, "host", "*", "Specify service host")
+	flags.BoolVarP(&options.force, "force", "f", false, "Never prompt")
 
 	return cmd
 }
@@ -106,6 +110,12 @@ func runStop(curveadm *cli.CurveAdm, options stopOptions) error {
 		return err
 	}
 
+	// 3) force stop
+	if options.force {
+		fmt.Print(tui.PromptStopService(options.id, options.role, options.host))
+		return pb.Run()
+	}
+
 	// 3) confirm by user
 	pass := tui.ConfirmYes(tui.PromptStopService(options.id, options.role, options.host))
 	if !pass {

internal/task/scripts/shell/start_gateway.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-# Usage: curve fs gateway --mdsaddr={mdsaddr} --listen-address {listenAddr} --console-address {consoleAddr} --mountpoint {mountPoint}
-# Example: curve fs gateway --mdsaddr=172.20.7.232:16700,172.20.7.233:16700,172.20.7.234:16700 --listen-address=:29000 --console-address=:29002 --mountpoint=/home/dingofs/cli/cli1
+# Usage: curve gateway --mdsaddr={mdsaddr} --listen-address {listenAddr} --console-address {consoleAddr} --mountpoint {mountPoint}
+# Example: curve gateway --mdsaddr=172.20.7.232:16700,172.20.7.233:16700,172.20.7.234:16700 --listen-address=:29000 --console-address=:29002 --mountpoint=/home/dingofs/cli/cli1
 # Created Date: 2024-10-30
 # Author: Wei Dong (jackblack369)
 
 
 g_curvefs="curve"
-g_curvefs_operator="fs gateway"
+g_curvefs_operator="gateway"
 g_mdsaddr="--mdsaddr="
 g_listen_address="--listen-address="
 g_console_address="--console-address="