add args

api/grpc/server/server.go

@@ -505,6 +505,7 @@ func (s *apiServer) Migration(ctx context.Context, r *types.MigrationRequest) (*
 	e := &supervisor.MigrationTask{}
 	e.WithContext(ctx)
 	e.Id = r.Id
+	e.Args = r.Args
 	e.TargetMachine = struct {
 		Host string
 		Port uint32
@@ -524,6 +525,7 @@ func (s *apiServer) PreMigration(ctx context.Context, r *types.PreMigrationReque
 	e.Cname = r.CName
 	e.SrcIp = r.SrcIp
 	e.UpperId = r.Upperid
+	e.Args = r.Args
 	for _, v := range r.Vol {
 		e.Vol = append(e.Vol, struct {
 			Src string

api/grpc/types/api.proto

@@ -28,6 +28,7 @@ message PreMigrationRequest {
 	string cName=4;
 	string srcIp=5;
 	string upperid=6;
+	repeated string args=7;
 }
 
 message Volumes {
@@ -42,6 +43,7 @@ message PreMigrationResponse {
 message MigrationRequest {
 	string id=1;
 	TargetMachine targetmachine=2;
+	repeated string args=3;
 }
 
 message MigrationResponse {

ctr/migration.go

@@ -9,9 +9,10 @@ import (
 )
 
 var migrationCommand = cli.Command{
-	Name:      "migration",
-	Usage:     "migration containers",
-	ArgsUsage: "<container-id> <ip> <port> || mysql 192.168.18.2 9001",
+	Name:  "migration",
+	Usage: "migration containers",
+	ArgsUsage: "-H <ip> -p <port> -A <args> <container-id> ||" +
+		" 192.168.18.2 9001 -A -e MYSQL_ROOT_PASSWORD=123456 mysql",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "host,H",
@@ -21,6 +22,10 @@ var migrationCommand = cli.Command{
 			Name:  "port,p",
 			Usage: "host port",
 		},
+		cli.StringSliceFlag{
+			Name:  "args,A",
+			Usage: "create docker containers args",
+		},
 	},
 	Action: func(context *cli.Context) error {
 		if err := checkArgs(context, 1); err != nil {
@@ -30,7 +35,8 @@ var migrationCommand = cli.Command{
 		id := context.Args().First()
 		ip := context.String("host")
 		port := context.Uint("port")
-		fmt.Printf("id:%v, ip %v, port:%v\n", id, ip, port)
+		args := context.StringSlice("args")
+		fmt.Printf("id:%v, ip: %v, port:%v, args: %v\n", id, ip, port, args)
 		c := getClient(context)
 		machine := &types.TargetMachine{
 			Ip:   ip,
@@ -39,20 +45,21 @@ var migrationCommand = cli.Command{
 		_, err := c.Migration(netcontext.Background(), &types.MigrationRequest{
 			Id:            id,
 			Targetmachine: machine,
+			Args:          args,
 		})
 		if err != nil {
 			fmt.Println(err)
 			return err
 		}
-		fmt.Println("after rpc!")
+		fmt.Println("finish rpc!")
 		return nil
 	},
 }
 
 func checkArgs(context *cli.Context, expected int) error {
 	var err error
 	cmdName := context.Command.Name
-	fmt.Printf("nums is %v\n", context.NArg())
+	fmt.Printf("nums is %v,args is %v\n", context.NArg(), context.Args())
 	if context.NArg() != expected {
 		err = fmt.Errorf("%s: %q requires exactly %d argument(s)", os.Args[0], cmdName, expected)
 	}

supervisor/migration.go

@@ -18,38 +18,22 @@ import (
 type MigrationTask struct {
 	baseTask
 	TargetMachine
-	Id string
+	Id   string
+	Args []string
 }
 
 type TargetMachine struct {
 	Host string
 	Port uint32
 }
 
-//
-//type localMigration struct {
-//	*containerInfo
-//	Rootfs string
-//	Bundle string
-//	CheckpointDir string
-//	IsDump bool
-//
-//}
-//
-//type remoteMigration struct {
-//	Id string
-//	Rootfs string
-//	Bundle string
-//	CheckpointDir string
-//}
-
 var (
 	TimeLogger *log.Logger
 	TimeLogPos = "/run/migration/time.log"
 )
 
 func (s *Supervisor) StartMigration(t *MigrationTask) error {
-
+	logrus.SetFormatter(&logrus.TextFormatter{FullTimestamp:true})
 	f, err := os.OpenFile(TimeLogPos, os.O_CREATE|os.O_RDWR|os.O_APPEND, 0666)
 	if err != nil {
 		logrus.Printf("set timelog err:%v\n", err)
@@ -208,10 +192,9 @@ func (t *MigrationTask) startMigrationTask(c *containerInfo) error {
 		return err
 	}
 
-	//r,_:=migration.NewRemoteMigration(t,l)
 	//在目的主机进行premigration准备操作
 	logrus.Println("start premigration")
-	if err = r.PreRemoteMigration(t.Id, l.Imagedir.GetUpperId()); err != nil {
+	if err = r.PreRemoteMigration(t.Id, l.Imagedir.GetUpperId(), t.Args); err != nil {
 		logrus.Printf("premigration error: %v\n", err)
 		return err
 	}

supervisor/migration/lazycopydir/manager.go

@@ -2,7 +2,6 @@ package lazycopydir
 
 import "time"
 
-
 //crwdir 挂载的nfs目录 monidiruper读写层目录 lazydir 惰复制目录
 func StartLazyCopy(crwdir, monidir, lazydir string) error {
 
@@ -76,4 +75,4 @@ func (replicator *LazyReplicator) Dolazycopy() error {
 	glog.Println("finish lazycopy!")
 
 	return nil
-}
+}

supervisor/migration/lazycopydir/replicator.go

@@ -51,9 +51,9 @@ func (l *LazyReplicator) Replicate() error {
 		targetdir = filepath.Join(l.LazyDir, file)
 
 		if isdir(file) {
-			_,err:=os.Stat(targetdir)
+			_, err := os.Stat(targetdir)
 			if os.IsNotExist(err) {
-				os.MkdirAll(targetdir,0755)
+				os.MkdirAll(targetdir, 0755)
 			}
 		} else {
 			if err = LocalCopy(sourcedir, targetdir); err != nil {
@@ -66,8 +66,8 @@ func (l *LazyReplicator) Replicate() error {
 	return nil
 }
 
-func isdir(v string)bool  {
-	if v[len(v)-1]=='/' {
+func isdir(v string) bool {
+	if v[len(v)-1] == '/' {
 		return true
 	}
 	return false

supervisor/migration/preMigration.go

@@ -22,22 +22,29 @@ type PreMigrationInTargetMachine struct {
 	ImageName string
 	Vol       []Volumes
 	SrcIp     string
+	Args      []string
 }
 
 var (
-	lazyreplicator=make([]*lazycopydir.LazyReplicator,0)
+	lazyreplicator = make([]*lazycopydir.LazyReplicator, 0)
 )
 
 func (p *PreMigrationInTargetMachine) StartPre() error {
 	var (
 		err error
 	)
+
+	if len(p.Vol) == 0 {
+		goto CREATCONT
+	}
+
 	glog.Println("premkdir")
 	if err = p.PreMkVolDir(); err != nil {
 		glog.Println(err)
 		return err
 	}
 
+CREATCONT:
 	glog.Println("create docker container")
 	if err = p.CreateDockerContainer(); err != nil {
 		glog.Println(err)
@@ -49,6 +56,9 @@ func (p *PreMigrationInTargetMachine) StartPre() error {
 		glog.Println(err)
 		return err
 	}
+	if len(p.Vol) == 0 {
+		goto STARTCONT
+	}
 
 	glog.Println("mount nfs")
 	if err = p.MountNfs(); err != nil {
@@ -63,18 +73,19 @@ func (p *PreMigrationInTargetMachine) StartPre() error {
 	}
 
 	glog.Println("pre lazycopy")
-	if err=p.StartPreLazyCopy();err!=nil {
+	if err = p.StartPreLazyCopy(); err != nil {
 		glog.Println(err)
 		return err
 	}
 
+STARTCONT:
 	glog.Println("start docker container")
-	if err=p.StartDockerContainer();err!=nil {
+	if err = p.StartDockerContainer(); err != nil {
 		glog.Println(err)
 		return err
 	}
 
-	glog.Printf("now container start run! %v\n",time.Now())
+	glog.Printf("now container start run! %v\n", time.Now())
 
 	glog.Println("start lazycopy")
 	if err = p.StartLazyCopy(); err != nil {
@@ -119,18 +130,22 @@ func (p *PreMigrationInTargetMachine) CreateDockerContainer() error {
 	var (
 		err error
 	)
-	args1:=append([]string{"rm"},p.Cname+"copy")
-	cmd1:=exec.Command("docker",args1...)
+	args1 := append([]string{"rm"}, p.Cname+"copy")
+	cmd1 := exec.Command("docker", args1...)
 	cmd1.Run()
 
-	args := append([]string{"create", "-P", "--security-opt", "seccomp:unconfined",
-		"-e", "MYSQL_ROOT_PASSWORD=123456", "--name"},
-		p.Cname+"copy")
-	//args=append(args,"-v")
+	args := append([]string{"create", "-P", "--security-opt",
+		"seccomp:unconfined", "--name"}, p.Cname+"copy")
+
+	if len(p.Args) != 0 {
+		args = append(args, p.Args...)
+	}
+
 	for i, v := range p.Vol {
 		args = append(args, "-v", fmt.Sprintf("%s:%s",
 			filepath.Join(preVolume, p.Id, strconv.Itoa(i), "merge"), v.dst))
 	}
+
 	args = append(args, p.ImageName)
 	cmd := exec.Command("docker", args...)
 	glog.Printf("create cmd is %v\n", cmd.Args)
@@ -141,14 +156,14 @@ func (p *PreMigrationInTargetMachine) CreateDockerContainer() error {
 	return nil
 }
 
-func (p *PreMigrationInTargetMachine) StartDockerContainer() error  {
-	name:=p.Cname+"copy"
-	args:=[]string{"start","--checkpoint-dir"}
-	args=append(args,filepath.Join(RemoteCheckpointDir,p.Id+"copy"))
-	args=append(args,"--checkpoint",DumpAll,name)
-	cmd:=exec.Command("docker",args...)
-	glog.Printf("start docker cmd is %v\n",cmd.Args)
-	if err:=cmd.Run();err!=nil {
+func (p *PreMigrationInTargetMachine) StartDockerContainer() error {
+	name := p.Cname + "copy"
+	args := []string{"start", "--checkpoint-dir"}
+	args = append(args, filepath.Join(RemoteCheckpointDir, p.Id+"copy"))
+	args = append(args, "--checkpoint", DumpAll, name)
+	cmd := exec.Command("docker", args...)
+	glog.Printf("start docker cmd is %v\n", cmd.Args)
+	if err := cmd.Run(); err != nil {
 		glog.Println(err)
 		return err
 	}
@@ -266,35 +281,34 @@ func (p *PreMigrationInTargetMachine) StartPreLazyCopy() error {
 	var (
 		err                      error
 		crwdir, monidir, lazydir string
-
 	)
 
 	for i := 0; i < len(p.Vol); i++ {
 		glog.Printf("start lazy vol %d\n", i)
 		crwdir = filepath.Join(RemoteGetVolume(p.Id, i), "nfs")
 		monidir = filepath.Join(RemoteGetVolume(p.Id, i), "upper")
 		lazydir = filepath.Join(RemoteGetVolume(p.Id, i), "lazy")
-		r:=lazycopydir.NewLazyReplicator(crwdir,monidir,lazydir)
-		if err=r.Prelazy();err!=nil {
+		r := lazycopydir.NewLazyReplicator(crwdir, monidir, lazydir)
+		if err = r.Prelazy(); err != nil {
 			glog.Println(err)
 			return err
 		}
-		lazyreplicator=append(lazyreplicator,r)
+		lazyreplicator = append(lazyreplicator, r)
 
 	}
-	glog.Printf("finish pre lazy copy:%v",time.Now())
+	glog.Printf("finish pre lazy copy:%v", time.Now())
 	return nil
 }
 
 func (p *PreMigrationInTargetMachine) StartLazyCopy() error {
 	var (
 		err error
 	)
-	for _,v:=range lazyreplicator {
-		if err=v.Dolazycopy();err!=nil {
+	for _, v := range lazyreplicator {
+		if err = v.Dolazycopy(); err != nil {
 			glog.Println(err)
 			return err
 		}
 	}
 	return nil
-}
+}

supervisor/migration/remoteMigration.go

@@ -159,7 +159,7 @@ func (r *remoteMigration) SetSpec(l *localMigration) error {
 }
 
 //向目的主机发送grpc请求
-func (r *remoteMigration) PreRemoteMigration(id, upperid string) error {
+func (r *remoteMigration) PreRemoteMigration(id, upperid string, args []string) error {
 
 	//glog.Printf("upperid is %v\n",upperid)
 	var (
@@ -195,6 +195,7 @@ func (r *remoteMigration) PreRemoteMigration(id, upperid string) error {
 		ImageName: imagename,
 		SrcIp:     srcip,
 		CName:     Cname,
+		Args:      args,
 	}
 	pvol := make([]*types.Volumes, 0)
 	for _, v := range vol {

supervisor/preMigration.go

@@ -17,6 +17,7 @@ type PreMigrationTask struct {
 	Vol       []Volumes
 	Cname     string
 	SrcIp     string
+	Args      []string
 }
 
 type Volumes struct {
@@ -44,9 +45,10 @@ func (s *Supervisor) PreMigration(t *PreMigrationTask) error {
 		ImageName: t.ImageName,
 		Vol:       vols,
 		SrcIp:     t.SrcIp,
+		Args:      t.Args,
 	}
 
-	logrus.Printf("start preMigration at %v\n",time.Now())
+	logrus.Printf("start preMigration at %v\n", time.Now())
 	if err = pre.StartPre(); err != nil {
 		logrus.Printf("start pre in supervisor error:%v\n", err)
 		return err