[mount] config skip pull image by '--local' when mount fs

Author: jackblack369

cli/command/client/mount.go

@@ -53,12 +53,13 @@ var (
 )
 
 type mountOptions struct {
-	host        string
-	mountFSName string
-	mountFSType string
-	mountPoint  string
-	filename    string
-	insecure    bool
+	host          string
+	mountFSName   string
+	mountFSType   string
+	mountPoint    string
+	filename      string
+	insecure      bool
+	useLocalImage bool
 }
 
 func checkMountOptions(curveadm *cli.CurveAdm, options mountOptions) error {
@@ -95,6 +96,7 @@ func NewMountCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags.StringVarP(&options.filename, "conf", "c", "client.yaml", "Specify client configuration file")
 	flags.StringVar(&options.mountFSType, "fstype", "s3", "Specify fs data backend")
 	flags.BoolVarP(&options.insecure, "insecure", "k", false, "Mount without precheck")
+	flags.BoolVar(&options.useLocalImage, "local", false, "Use local image to mount")
 
 	return cmd
 }
@@ -122,6 +124,7 @@ func genMountPlaybook(curveadm *cli.CurveAdm,
 				},
 				comm.KEY_CLIENT_HOST:              options.host, // for checker
 				comm.KEY_CHECK_KERNEL_MODULE_NAME: comm.KERNERL_MODULE_FUSE,
+				comm.KEY_USE_LOCAL_IMAGE:          options.useLocalImage,
 			},
 			ExecOptions: playbook.ExecOptions{
 				SilentSubBar: step == playbook.CHECK_CLIENT_S3,

internal/common/common.go

@@ -85,6 +85,7 @@ const (
 	KEY_CLIENT_STATUS_VERBOSE = "CLIENT_STATUS_VERBOSE"
 	KEY_MAP_OPTIONS           = "MAP_OPTIONS"
 	KEY_MOUNT_OPTIONS         = "MOUNT_OPTIONS"
+	KEY_USE_LOCAL_IMAGE       = "USE_LOCAL_IMAGE"
 	CLIENT_STATUS_LOSED       = "Losed"
 	CLIENT_STATUS_UNKNOWN     = "Unknown"
 	KERNERL_MODULE_NBD        = "nbd"

internal/task/task/fs/mount.go

@@ -360,10 +360,13 @@ func NewMountFSTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.T
 	t.AddStep(&step.Lambda{
 		Lambda: checkMountStatus(mountPoint, containerName, &out),
 	})
-	t.AddStep(&step.PullImage{
-		Image:       cc.GetContainerImage(),
-		ExecOptions: curveadm.ExecOptions(),
-	})
+	useLocalImage := curveadm.MemStorage().Get(comm.KEY_USE_LOCAL_IMAGE).(bool)
+	if !useLocalImage {
+		t.AddStep(&step.PullImage{
+			Image:       cc.GetContainerImage(),
+			ExecOptions: curveadm.ExecOptions(),
+		})
+	}
 	t.AddStep(&step.CreateContainer{
 		Image:             cc.GetContainerImage(),
 		Command:           getMountCommand(cc, mountFSName, mountFSType, mountPoint),