From 66f2c598005299c0ad6fa102d19747df064fefe3 Mon Sep 17 00:00:00 2001
From: gojoy <729324352@qq.com>
Date: Tue, 8 May 2018 22:21:15 +0800
Subject: [PATCH] run test

---
 api/grpc/server/server.go                 |   2 +-
 supervisor/migration.go                   |  38 ++---
 supervisor/migration/containerUtils.go    |  38 ++---
 supervisor/migration/fdsSync.go           |  57 ++++---
 supervisor/migration/image.go             |  80 +++++----
 supervisor/migration/lazycopydir/merge.go |   4 +-
 supervisor/migration/localMigration.go    | 197 +++++++++++-----------
 supervisor/migration/memprecopy.go        |  83 +++++----
 supervisor/migration/preMigration.go      |  14 +-
 supervisor/migration/remoteMigration.go   |   2 +-
 supervisor/migration/utils_test.go        |  27 ++-
 supervisor/preMigration.go                |   6 +-
 12 files changed, 279 insertions(+), 269 deletions(-)

diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
index 70f27e1..1ee5b2c 100644
--- a/api/grpc/server/server.go
+++ b/api/grpc/server/server.go
@@ -530,7 +530,7 @@ func (s *apiServer) PreMigration(ctx context.Context, r *types.PreMigrationReque
 		e.Vol = append(e.Vol, struct {
 			Src, Dst string
 			IsWrite  bool
-		}{Src:v.Src , Dst:v.Dst , IsWrite:v.Iswrite })
+		}{Src:v.Src, Dst:v.Dst, IsWrite:v.Iswrite})
 	}
 	s.sv.SendTask(e)
 	if err := <-e.ErrorCh(); err != nil {
diff --git a/supervisor/migration.go b/supervisor/migration.go
index b548816..ac3e2be 100644
--- a/supervisor/migration.go
+++ b/supervisor/migration.go
@@ -142,13 +142,11 @@ func (t *MigrationTask) startMigrationTask(c *containerInfo) error {
 	var (
 		e   = make(chan error)
 		err error
-		st time.Time
+		st  time.Time
 	)
 	start := time.Now()
 	log.Printf("start migration task at %v\n", start.String())
 
-
-
 	log.Println("new local")
 	l, err := migration.NewLocalMigration(c.container)
 	if err != nil {
@@ -157,12 +155,12 @@ func (t *MigrationTask) startMigrationTask(c *containerInfo) error {
 	}
 
 	log.Println("test getmem!")
-	mem,err:=l.GetContainerMem()
-	if err!=nil {
+	mem, err := l.GetContainerMem()
+	if err != nil {
 		log.Println(err)
 		return err
 	}
-	log.Printf("mem is %v\n",mem)
+	log.Printf("mem is %v\n", mem)
 	//panic("test finish!")
 
 	log.Println("new remote")
@@ -176,26 +174,26 @@ func (t *MigrationTask) startMigrationTask(c *containerInfo) error {
 	go r.PreLoadImage(e, l.Imagedir)
 
 	log.Println("copy readonly to remote")
-	if err=l.CopyReadVolToRemote(r);err!=nil {
+	if err = l.CopyReadVolToRemote(r); err != nil {
 		log.Println(err)
 		return err
 	}
 
 	log.Println("start watch write vol")
-	vwather,err:=l.Watchwritevol()
-	if err!=nil {
+	vwather, err := l.Watchwritevol()
+	if err != nil {
 		log.Println(err)
 		return err
 	}
 
 	log.Println("copy write vol to remote")
-	if err=l.CopyWriteVolToRemote(r);err!=nil {
+	if err = l.CopyWriteVolToRemote(r); err != nil {
 		log.Println(err)
 		return err
 	}
 
 	log.Println("start precopy mem")
-	time.Sleep(10*time.Second)
+	time.Sleep(20 * time.Second)
 
 	//TODO 将hostpath的目录nfs到远程挂载 准备在本机的工作
 	log.Println("start nfs hostpath")
@@ -226,33 +224,33 @@ func (t *MigrationTask) startMigrationTask(c *containerInfo) error {
 	}
 
 	log.Println("get stable filelist")
-	stablemap,err:=l.Getstablefiles(vwather)
-	if err!=nil {
+	stablemap, err := l.Getstablefiles(vwather)
+	if err != nil {
 		log.Println(err)
 		return err
 	}
 
 	log.Println("save openfile json")
-	if err=l.SaveOpenFile();err!=nil {
+	if err = l.SaveOpenFile(); err != nil {
 		log.Println(err)
 		return err
 	}
 
 	log.Println("fdsync files!")
-	st=time.Now()
-	if err=l.SyncWriteFd(r,stablemap);err!=nil {
+	st = time.Now()
+	if err = l.SyncWriteFd(r, stablemap); err != nil {
 		log.Println(err)
 		return err
 	}
-	log.Printf("fdsync time:%v\n",time.Since(st))
+	log.Printf("fdsync time:%v\n", time.Since(st))
 
 	log.Println("directrsync!")
-	st=time.Now()
-	if err=l.DirectRsync(r);err!=nil {
+	st = time.Now()
+	if err = l.DirectRsync(r); err != nil {
 		log.Println(err)
 		return err
 	}
-	log.Printf("direct time:%v\n",time.Since(st))
+	log.Printf("direct time:%v\n", time.Since(st))
 
 	panic("test done!")
 
diff --git a/supervisor/migration/containerUtils.go b/supervisor/migration/containerUtils.go
index e4b0bba..3904e97 100644
--- a/supervisor/migration/containerUtils.go
+++ b/supervisor/migration/containerUtils.go
@@ -501,51 +501,51 @@ func GetMotifyFiles(path string, ctx context.Context, res motifyvols) error {
 
 	for {
 		select {
-		case events:=<-w.Events:
-			if _,ok:=res[events.Name];!ok {
-				res[events.Name]=events.Op.String()
+		case events := <-w.Events:
+			if _, ok := res[events.Name]; !ok {
+				res[events.Name] = events.Op.String()
 			}
 		case <-ctx.Done():
 
 			goto END
 		}
 	}
-	END:
-		log.Printf("end monitor %v\n",path)
+END:
+	log.Printf("end monitor %v\n", path)
 	return nil
 }
 
-func getmap(files []string) map[string]bool  {
+func getmap(files []string) map[string]bool {
 	var (
-		res=make(map[string]bool)
+		res = make(map[string]bool)
 	)
-	for _,v:=range files {
-		if _,ok:=res[v];!ok {
-			res[v]=true
+	for _, v := range files {
+		if _, ok := res[v]; !ok {
+			res[v] = true
 		}
 	}
-	
-	if _,ok:=res["ib_logfile1"];!ok {
-		if _,ok:=res["ib_logfile0"];ok {
-			delete(res,"ib_logfile0")
+
+	if _, ok := res["ib_logfile1"]; !ok {
+		if _, ok := res["ib_logfile0"]; ok {
+			delete(res, "ib_logfile0")
 		}
 	}
 
 	return res
 }
 
-func getstablerelatepath(files []string,vol Volumes) []string  {
+func getstablerelatepath(files []string, vol Volumes) []string {
 	var (
-		res=make([]string,0)
+		res = make([]string, 0)
 	)
-	if len(files)==0 {
+	if len(files) == 0 {
 		panic("files len is 0")
 	}
-	for _,v:=range files {
+	for _, v := range files {
 		right := strings.TrimPrefix(v, vol.src)
 		if len(right) != len(v) {
 			res = append(res, right[1:])
 		}
 	}
 	return res
-}
\ No newline at end of file
+}
diff --git a/supervisor/migration/fdsSync.go b/supervisor/migration/fdsSync.go
index 0ccdfd3..7fe5d71 100644
--- a/supervisor/migration/fdsSync.go
+++ b/supervisor/migration/fdsSync.go
@@ -8,11 +8,10 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"errors"
+	"sync"
+	"time"
 )
 
-
-
 //首先把数据卷拷贝到对应的远程upper目录，然后根据crit x fds文件列表，同步这些文件
 //在本地监控数据卷，生成map 所有变更都存在其中，然后把上次同步过的文件从map中删除，
 // 之后在目的主机的upper目录，文件只有在map中，表示以及不是最新版本，就删除
@@ -25,7 +24,7 @@ type allpath [2]string
 type volpath []allpath
 
 // remoteVolumesDirs:代表每个write数据卷在目的主机的拷贝目录
-func fdsSync(checkpointDir string, remoteVolumesDirs string, vols Volumes, ip string,smap map[string]bool) error {
+func fdsSync(checkpointDir string, remoteVolumesDirs string, vols Volumes, ip string, smap map[string]bool) error {
 	files, err := getFiles(checkpointDir)
 	if err != nil {
 		log.Println(err)
@@ -37,9 +36,9 @@ func fdsSync(checkpointDir string, remoteVolumesDirs string, vols Volumes, ip st
 		return err
 	}
 
-	log.Printf("before delete,len is %v,syncfiles is %v",len(syncfiles),syncfiles)
-	syncfiles=deletefromstablemap(syncfiles,smap)
-	log.Printf("now len is %v,syncfiles  is %v\n",len(syncfiles),syncfiles)
+	log.Printf("before delete,len is %v,syncfiles is %v", len(syncfiles), syncfiles)
+	syncfiles = deletefromstablemap(syncfiles, smap)
+	log.Printf("now len is %v,syncfiles  is %v\n", len(syncfiles), syncfiles)
 
 	if err = fastCopy(syncfiles, ip, remoteVolumesDirs, vols); err != nil {
 		log.Println(err)
@@ -50,17 +49,17 @@ func fdsSync(checkpointDir string, remoteVolumesDirs string, vols Volumes, ip st
 
 func deletefromstablemap(files []string, stmap map[string]bool) []string {
 
-	if len(files)==0 {
+	if len(files) == 0 {
 		panic("files is 0")
 	}
-	if len(stmap)==0 {
+	if len(stmap) == 0 {
 		log.Println("stmap is 0")
 	}
-	for i:=0;i<len(files);i++ {
-		if stmap[files[i]]==true {
-			log.Printf("delete %v\n",files[i])
-			files[i]=files[len(files)-1]
-			files=files[:len(files)-1]
+	for i := 0; i < len(files); i++ {
+		if stmap[files[i]] == true {
+			log.Printf("delete %v\n", files[i])
+			files[i] = files[len(files)-1]
+			files = files[:len(files)-1]
 			i--
 		}
 	}
@@ -75,7 +74,7 @@ func SaveOpenFile(checkdir, path string, vol Volumes) error {
 		log.Println(err)
 		return err
 	}
-	data:= syncNeedFiles(files, vol)
+	data := syncNeedFiles(files, vol)
 	if err != nil {
 		log.Println(err)
 		return err
@@ -148,7 +147,7 @@ func getFiles(path string) ([]string, error) {
 
 //找到再数据卷中的文件
 func syncNeedFiles(files []string, vol Volumes) []string {
-	log.Printf("dst is %v\n",vol.dst)
+	log.Printf("dst is %v\n", vol.dst)
 	var (
 		res = make([]string, 0)
 	)
@@ -176,22 +175,38 @@ func syncNeedFiles(files []string, vol Volumes) []string {
 func fastCopy(files []string, ip string, remote string, vol Volumes) error {
 	var (
 		err error
+		wg  sync.WaitGroup
+		st  time.Time
 	)
 	if len(files) == 0 {
 		log.Println("files len is 0")
-		return errors.New("files nil")
+		return nil
 	}
 
 	//log.Printf("f is %v\n",files)
 	if err = os.Chdir(vol.src); err != nil {
 		log.Println(err)
 	}
+
+	st = time.Now()
+
 	for _, v := range files {
 		log.Printf("fdsync:%v\n",v)
-		if err = RemoteCopyFileRsync(v, remote, ip); err != nil {
-			log.Println(err)
-		}
+		wg.Add(1)
+
+		go func(file string) {
+			defer wg.Done()
+			log.Printf("fdsync:%v\n", file)
+			if err = RemoteCopyFileRsync(file, remote, ip); err != nil {
+				log.Println(err)
+			}
+		}(v)
+
 	}
+
+	wg.Wait()
+
+	log.Printf("fastcopy time is %v\n", time.Since(st))
 	return nil
 }
 
@@ -211,7 +226,7 @@ func RemoteCopyFileRsync(local, remote string, ip string) error {
 	//log.Printf("l is %v,r is %v,args is %v\n",local,remote,args)
 
 	cmd := exec.Command("rsync", args...)
-	//log.Println(cmd.Args)
+	log.Println(cmd.Args)
 
 	if out, err := cmd.CombinedOutput(); err != nil {
 		log.Printf("rsync error:%v,out:%v\n", err, string(out))
diff --git a/supervisor/migration/image.go b/supervisor/migration/image.go
index 743f124..bf4c7f8 100644
--- a/supervisor/migration/image.go
+++ b/supervisor/migration/image.go
@@ -1,6 +1,7 @@
 package migration
 
 import (
+	"context"
 	"errors"
 	"github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/specs"
@@ -10,7 +11,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"context"
 )
 
 const Driver = "overlay2"
@@ -29,15 +29,13 @@ type Image struct {
 }
 
 type volwatcher struct {
-	vol []Volumes
-	res motifyvols
-	ctx context.Context
+	vol    []Volumes
+	res    motifyvols
+	ctx    context.Context
 	cancel context.CancelFunc
-	files []string
+	files  []string
 }
 
-
-
 // 解析overlay2镜像的lower层（只读）和upper层（读写）
 func NewImage(c runtime.Container) (*Image, error) {
 
@@ -176,79 +174,79 @@ func (i *Image) GetUpperId() string {
 	return i.upperid
 }
 
-func Newvolwatcher(vol []Volumes) *volwatcher  {
-	r:=make(motifyvols,0)
-	ctx,cancel:=context.WithCancel(context.Background())
-	vwatcher:=&volwatcher{
-		vol:vol,
-		res:r,
-		ctx:ctx,
-		cancel:cancel,
+func Newvolwatcher(vol []Volumes) *volwatcher {
+	r := make(motifyvols, 0)
+	ctx, cancel := context.WithCancel(context.Background())
+	vwatcher := &volwatcher{
+		vol:    vol,
+		res:    r,
+		ctx:    ctx,
+		cancel: cancel,
 	}
 	return vwatcher
 }
 
 func (vw *volwatcher) StartWatch() error {
-	v1:=make([]Volumes,0)
-	f:=make([]string,0)
-	for _,v:=range vw.vol {
+	v1 := make([]Volumes, 0)
+	f := make([]string, 0)
+	for _, v := range vw.vol {
 		if v.isWrite {
-			v1=append(v1,v)
+			v1 = append(v1, v)
 		}
 	}
-	if len(v1)!=1 {
+	if len(v1) != 1 {
 		log.Println("write vol is not one")
 		return errors.New("write vol is not one")
 	}
 
-	err:=filepath.Walk(v1[0].src, func(path string, info os.FileInfo, err error) error {
-		if err!=nil {
+	err := filepath.Walk(v1[0].src, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
 			log.Println(err)
 			return err
 		}
-		f=append(f, path)
+		f = append(f, path)
 		return nil
 	})
-	if err!=nil {
+	if err != nil {
 		log.Println(err)
 		return err
 	}
-	f=f[1:]
-	vw.files=f
+	f = f[1:]
+	vw.files = f
 
 	go func() {
-		err:=GetMotifyFiles(v1[0].src,vw.ctx,vw.res)
-		if err!=nil {
+		err := GetMotifyFiles(v1[0].src, vw.ctx, vw.res)
+		if err != nil {
 			panic(err)
 		}
 	}()
 	return nil
 }
 
-func (vw *volwatcher) StopWatch()  {
+func (vw *volwatcher) StopWatch() {
 	vw.cancel()
 }
 
-func (vw *volwatcher) GetRes() (motifyvols)  {
+func (vw *volwatcher) GetRes() motifyvols {
 	return vw.res
 }
 
-func (vw *volwatcher) GetStablefile() ([]string,error) {
+func (vw *volwatcher) GetStablefile() ([]string, error) {
 	vw.StopWatch()
-	list:=vw.files
-	mp:=vw.GetRes()
-	stable:=make([]string,0)
-	if len(list)==0 {
+	list := vw.files
+	mp := vw.GetRes()
+	stable := make([]string, 0)
+	if len(list) == 0 {
 		log.Println("nil list")
-		return nil,errors.New("nil list")
+		return nil, errors.New("nil list")
 	}
-	for _,v:=range list {
-		if _,ok:=mp[v];!ok {
-			stable=append(stable,v)
+	for _, v := range list {
+		if _, ok := mp[v]; !ok {
+			stable = append(stable, v)
 		} else {
 			//log.Printf("%v has change",v)
 		}
 	}
 
-	return stable,nil
-}
\ No newline at end of file
+	return stable, nil
+}
diff --git a/supervisor/migration/lazycopydir/merge.go b/supervisor/migration/lazycopydir/merge.go
index 9d0660c..3f16a9a 100644
--- a/supervisor/migration/lazycopydir/merge.go
+++ b/supervisor/migration/lazycopydir/merge.go
@@ -1,10 +1,10 @@
 package lazycopydir
 
 import (
-	"path/filepath"
+	"log"
 	"os"
 	"os/exec"
-	"log"
+	"path/filepath"
 )
 
 //merge upper and lazy,we must umount mergedir before do it
diff --git a/supervisor/migration/localMigration.go b/supervisor/migration/localMigration.go
index 8a3ee9d..1f1a89a 100644
--- a/supervisor/migration/localMigration.go
+++ b/supervisor/migration/localMigration.go
@@ -1,22 +1,23 @@
 package migration
 
 import (
-	"github.com/containerd/containerd/runtime"
-	"os"
-	"path/filepath"
 	"errors"
 	"fmt"
+	"github.com/containerd/containerd/runtime"
 	"log"
+	"os"
+	"path/filepath"
 	"strconv"
 )
 
 const MigrationDir = "/run/migration"
 const DumpAll = "fullDump"
+
 //const nfsconfig = " 0.0.0.0/24(rw,async,no_root_squash,nohide)"
-const nfsconfig=" *(rw,async,no_root_squash,nohide)"
-const stablefile="stablefilelist.txt"
+const nfsconfig = " *(rw,async,no_root_squash,nohide)"
+const stablefile = "stablefilelist.txt"
 const openFileDir = "openfile.json"
-const directrsyncdir="direct"
+const directrsyncdir = "direct"
 
 type localMigration struct {
 	runtime.Container
@@ -26,35 +27,33 @@ type localMigration struct {
 	CheckpointName string
 	IsDump         bool
 	Imagedir       *Image
-	vols []Volumes
-	basedir string
-	writevolid int
+	vols           []Volumes
+	basedir        string
+	writevolid     int
 }
 
 type Volumes struct {
 	src, dst string
-	isWrite bool
+	isWrite  bool
 }
 
 type writevol struct {
 	vol Volumes
-	id int
+	id  int
 }
 
-
-func NewVolumes(src, dst string,iswrite bool) Volumes {
+func NewVolumes(src, dst string, iswrite bool) Volumes {
 	vol := Volumes{
-		src: src,
-		dst: dst,
-		isWrite:iswrite,
+		src:     src,
+		dst:     dst,
+		isWrite: iswrite,
 	}
 	return vol
 }
 
-
 func NewLocalMigration(c runtime.Container) (*localMigration, error) {
 	var (
-		wv=make([]writevol,0)
+		wv = make([]writevol, 0)
 	)
 	i, err := NewImage(c)
 	if err != nil {
@@ -68,31 +67,31 @@ func NewLocalMigration(c runtime.Container) (*localMigration, error) {
 	l.IsDump = false
 	l.Imagedir = i
 	l.CheckpointName = DumpAll
-	l.basedir=filepath.Join(MigrationDir,c.ID())
-	if err:=os.MkdirAll(l.basedir,0666);err!=nil {
+	l.basedir = filepath.Join(MigrationDir, c.ID())
+	if err := os.MkdirAll(l.basedir, 0666); err != nil {
 		log.Println(err)
-		return nil,err
+		return nil, err
 	}
 
-	vols,err:=GetVolume(c.ID())
-	if err!=nil {
+	vols, err := GetVolume(c.ID())
+	if err != nil {
 		log.Println(err)
-		return nil,err
+		return nil, err
 	}
-	l.vols=vols
-	for i,v:=range vols {
+	l.vols = vols
+	for i, v := range vols {
 		if v.isWrite {
-			wv=append(wv, struct {
+			wv = append(wv, struct {
 				vol Volumes
 				id  int
-			}{vol: v, id:i })
+			}{vol: v, id: i})
 		}
 	}
-	if len(wv)!=1 {
+	if len(wv) != 1 {
 		log.Println("container write vol not one")
-		return nil,errors.New("container write vol not one")
+		return nil, errors.New("container write vol not one")
 	}
-	l.writevolid=wv[0].id
+	l.writevolid = wv[0].id
 	if err := os.MkdirAll(l.CheckpointDir, 0666); err != nil {
 		return nil, err
 	}
@@ -158,19 +157,19 @@ func (l *localMigration) CopyReadVolToRemote(r *remoteMigration) error {
 	var (
 		err error
 	)
-	vols,err:=GetVolume(l.ID())
-	if err!=nil {
+	vols, err := GetVolume(l.ID())
+	if err != nil {
 		log.Println(err)
 		return err
 	}
-	for I,v:=range vols {
+	for I, v := range vols {
 		if !v.isWrite {
-			remoteVolPath:=filepath.Join(preVolume,l.ID(),strconv.Itoa(I),"merge")
+			remoteVolPath := filepath.Join(preVolume, l.ID(), strconv.Itoa(I), "merge")
 			if err = RemoteMkdirAll(remoteVolPath, r.sftpClient); err != nil {
 				log.Println(err)
 				return err
 			}
-			if err=RemoteCopyDirRsync(v.src,remoteVolPath,r.ip);err!=nil {
+			if err = RemoteCopyDirRsync(v.src, remoteVolPath, r.ip); err != nil {
 				log.Println(err)
 				return err
 			}
@@ -183,34 +182,37 @@ func (l *localMigration) CopyWriteVolToRemote(r *remoteMigration) error {
 	var (
 		err error
 	)
-	if r==nil {
+	if r == nil {
 		return fmt.Errorf("Err: remote nil\n ")
 	}
-	vols:=l.vols
+	vols := l.vols
 
-	for i,v:=range vols {
+	for i, v := range vols {
 		if v.isWrite {
-			remotePath:=filepath.Join(remoteWriteVolume,l.ID(),strconv.Itoa(i))
-			if err = RemoteMkdirAll(remotePath, r.sftpClient); err != nil {
+
+			remotePath := filepath.Join(remoteWriteVolume, l.ID(), strconv.Itoa(i))
+			remotepathcopy := remotePath + directrsyncdir
+			if err = RemoteMkdirAll(remotepathcopy, r.sftpClient); err != nil {
 				log.Println(err)
 				return err
 			}
-			log.Printf("copy writevol id:%v\n",i)
-			if err=RemoteCopyDirRsync(v.src,remotePath,r.ip);err!=nil {
+			if err = RemoteCopyDirRsync(v.src, remotepathcopy, r.ip); err != nil {
 				log.Println(err)
 				return err
 			}
 
-			remotepathcopy:=remotePath+directrsyncdir
-			if err = RemoteMkdirAll(remotepathcopy, r.sftpClient); err != nil {
+			if err = RemoteMkdirAll(remotePath, r.sftpClient); err != nil {
 				log.Println(err)
 				return err
 			}
-			if err=RemoteCopyDirRsync(v.src,remotepathcopy,r.ip);err!=nil {
+			log.Printf("copy writevol id:%v\n", i)
+			if err = RemoteCopyDirRsync(v.src, remotePath, r.ip); err != nil {
 				log.Println(err)
 				return err
 			}
 
+
+
 			//remotepathback:=remotePath+"back"
 			//if err = RemoteMkdirAll(remotepathback, r.sftpClient); err != nil {
 			//	log.Println(err)
@@ -249,27 +251,27 @@ func (l *localMigration) CopyCheckPointToRemote(r *remoteMigration) error {
 
 func (l *localMigration) SaveOpenFile() error {
 	var (
-		err error
-		writevols=make([]Volumes,0)
+		err       error
+		writevols = make([]Volumes, 0)
 	)
-	vol,err:=GetVolume(l.ID())
-	if err!=nil {
+	vol, err := GetVolume(l.ID())
+	if err != nil {
 		log.Println(err)
 		return err
 	}
-	for _,v:=range vol {
+	for _, v := range vol {
 		if v.isWrite {
-			writevols=append(writevols,v)
+			writevols = append(writevols, v)
 		}
 	}
-	if len(writevols)!=1 {
+	if len(writevols) != 1 {
 		log.Println("write vols nil")
 		return errors.New("write vols nil")
 	}
-	path:=filepath.Join(l.basedir,openFileDir)
-	ckdir:=filepath.Join(l.CheckpointDir,l.CheckpointName)
-	err=SaveOpenFile(ckdir,path,writevols[0])
-	if err!=nil {
+	path := filepath.Join(l.basedir, openFileDir)
+	ckdir := filepath.Join(l.CheckpointDir, l.CheckpointName)
+	err = SaveOpenFile(ckdir, path, writevols[0])
+	if err != nil {
 		log.Println(err)
 		return err
 	}
@@ -336,31 +338,30 @@ func (l *localMigration) SetNfsExport() error {
 	return err
 }
 
-
-func (l *localMigration) SyncWriteFd(r *remoteMigration,smap map[string]bool) error  {
+func (l *localMigration) SyncWriteFd(r *remoteMigration, smap map[string]bool) error {
 	var (
 		err error
-		wv=make([]writevol,0)
+		wv  = make([]writevol, 0)
 	)
-	vols:=l.vols
+	vols := l.vols
 
-	for i,v:=range vols {
+	for i, v := range vols {
 		if v.isWrite {
-			wv=append(wv, struct {
+			wv = append(wv, struct {
 				vol Volumes
 				id  int
-			}{vol: v, id:i })
+			}{vol: v, id: i})
 		}
 	}
-	if len(wv)!=1 {
+	if len(wv) != 1 {
 		log.Println("write vols nil")
 		return errors.New("write vols nil")
 	}
-	rpath:=filepath.Join(remoteWriteVolume,l.ID(),strconv.Itoa(wv[0].id))
-	lc:=filepath.Join(l.CheckpointDir,l.CheckpointName)
-	log.Printf("start fdssync vol:%v",wv[0])
-	err=fdsSync(lc,rpath,wv[0].vol,r.ip,smap)
-	if err!=nil {
+	rpath := filepath.Join(remoteWriteVolume, l.ID(), strconv.Itoa(wv[0].id))
+	lc := filepath.Join(l.CheckpointDir, l.CheckpointName)
+	log.Printf("start fdssync vol:%v", wv[0])
+	err = fdsSync(lc, rpath, wv[0].vol, r.ip, smap)
+	if err != nil {
 		log.Println(err)
 		return err
 	}
@@ -372,61 +373,61 @@ func (l *localMigration) DirectRsync(r *remoteMigration) error {
 	var (
 		err error
 	)
-	srcdir:=l.vols[l.writevolid].src
-	dstdir:=filepath.Join(remoteWriteVolume,l.ID(),strconv.Itoa(l.writevolid))+directrsyncdir
-	err=RemoteCopyDirRsync(srcdir,dstdir,r.ip)
-	if err!=nil {
+	srcdir := l.vols[l.writevolid].src
+	dstdir := filepath.Join(remoteWriteVolume, l.ID(), strconv.Itoa(l.writevolid)) + directrsyncdir
+	err = RemoteCopyDirRsync(srcdir, dstdir, r.ip)
+	if err != nil {
 		log.Println(err)
 		return err
 	}
 	return nil
 }
 
-func (l *localMigration) Watchwritevol() (*volwatcher,error) {
+func (l *localMigration) Watchwritevol() (*volwatcher, error) {
 	var (
-		err error
+		err      error
 		vwatcher *volwatcher
 	)
-	vwatcher=Newvolwatcher(l.vols)
-	err=vwatcher.StartWatch()
-	if err!=nil {
+	vwatcher = Newvolwatcher(l.vols)
+	err = vwatcher.StartWatch()
+	if err != nil {
 		log.Println(err)
-		return nil,err
+		return nil, err
 	}
-	return vwatcher,nil
+	return vwatcher, nil
 }
 
-func (l *localMigration) Getstablefiles(v *volwatcher) (map[string]bool,error) {
-	res,err:=v.GetStablefile()
-	if err!=nil {
+func (l *localMigration) Getstablefiles(v *volwatcher) (map[string]bool, error) {
+	res, err := v.GetStablefile()
+	if err != nil {
 		log.Println(err)
-		return nil,err
+		return nil, err
 	}
 	//log.Printf("stablefileres is: %v\n",res)
 
 	//log.Printf("vols is %v\n",l.vols[l.writevolid])
-	relatepath:=getstablerelatepath(res,l.vols[l.writevolid])
-	log.Printf("relatepath len is %v\n",len(relatepath))
-	if len(relatepath)==0 {
+	relatepath := getstablerelatepath(res, l.vols[l.writevolid])
+	log.Printf("relatepath len is %v\n", len(relatepath))
+	if len(relatepath) == 0 {
 		panic("len is 0")
 	}
 
-	stablemap:=getmap(relatepath)
+	stablemap := getmap(relatepath)
 
-	path:=filepath.Join(l.basedir,stablefile)
-	if err=dumpFiles(relatepath,path);err!=nil {
+	path := filepath.Join(l.basedir, stablefile)
+	if err = dumpFiles(relatepath, path); err != nil {
 		log.Println(err)
-		return nil,err
+		return nil, err
 	}
-	return stablemap,nil
+	return stablemap, nil
 }
 
 func (l *localMigration) GetContainerMem() (uint64, error) {
-	s,err:=l.Stats()
-	if err!=nil {
+	s, err := l.Stats()
+	if err != nil {
 		log.Println(err)
-		return 0,err
+		return 0, err
 	}
 	//log.Printf("mem is %v\n",s.Memory)
-	return s.Memory.Usage.Usage,nil
-}
\ No newline at end of file
+	return s.Memory.Usage.Usage, nil
+}
diff --git a/supervisor/migration/memprecopy.go b/supervisor/migration/memprecopy.go
index 279a601..c2beaf9 100644
--- a/supervisor/migration/memprecopy.go
+++ b/supervisor/migration/memprecopy.go
@@ -1,42 +1,41 @@
 package migration
 
 import (
-	"path/filepath"
-	"os/exec"
 	"log"
+	"os/exec"
+	"path/filepath"
 	"strconv"
 )
 
-const minMem=20*1024
-const maxTimes=10
-const netSpeed=1024*30
-const PreDump="predump"
+const minMem = 20 * 1024
+const maxTimes = 10
+const netSpeed = 1024 * 30
+const PreDump = "predump"
 
-
-func preCopy(id int) error  {
+func preCopy(id int) error {
 	var (
-		err error
-		base,path,parent string
-		i int
+		err                error
+		base, path, parent string
+		i                  int
 	)
-	base=filepath.Join(MigrationDir,PreDump,strconv.Itoa(id))
-	path=filepath.Join(base,"0")
-	if err=doFirstPreDump(id,path);err!=nil {
+	base = filepath.Join(MigrationDir, PreDump, strconv.Itoa(id))
+	path = filepath.Join(base, "0")
+	if err = doFirstPreDump(id, path); err != nil {
 		log.Println(err)
 		return err
 	}
-	for i=1;i<maxTimes;i++ {
-		parent=path
-		path=filepath.Join(base,strconv.Itoa(i))
-		if err=doNPreDump(id,path,parent);err!=nil {
+	for i = 1; i < maxTimes; i++ {
+		parent = path
+		path = filepath.Join(base, strconv.Itoa(i))
+		if err = doNPreDump(id, path, parent); err != nil {
 			log.Println(err)
 			return err
 		}
 
 	}
-	parent=path
-	path=filepath.Join(base,"last")
-	if err=doLastDump(id,path,parent);err!=nil {
+	parent = path
+	path = filepath.Join(base, "last")
+	if err = doLastDump(id, path, parent); err != nil {
 		log.Println(err)
 		return err
 	}
@@ -48,43 +47,43 @@ func doFirstPreDump(id int, path string) error {
 		err error
 	)
 
-	args:=[]string{"checkpoint","--pre-dump","tcp-established"}
-	args=append(args,"--image-path",path,"--work-path",path,strconv.Itoa(id))
-	cmd:=exec.Command("runc",args...)
-	out,err:=cmd.CombinedOutput()
-	if err!=nil {
-		log.Printf("err:%v,out:%v\n",err,string(out))
+	args := []string{"checkpoint", "--pre-dump", "tcp-established"}
+	args = append(args, "--image-path", path, "--work-path", path, strconv.Itoa(id))
+	cmd := exec.Command("runc", args...)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("err:%v,out:%v\n", err, string(out))
 		return err
 	}
 	return nil
 }
 
-func doNPreDump(id int,path,parent string) error  {
+func doNPreDump(id int, path, parent string) error {
 	var (
 		err error
 	)
-	args:=[]string{"checkpoint","--pre-dump","tcp-established"}
-	args=append(args,"--image-path",path,"--work-path",path,"--parent-path",parent,strconv.Itoa(id))
-	cmd:=exec.Command("runc",args...)
-	out,err:=cmd.CombinedOutput()
-	if err!=nil {
-		log.Printf("err:%v,out:%v\n",err,string(out))
+	args := []string{"checkpoint", "--pre-dump", "tcp-established"}
+	args = append(args, "--image-path", path, "--work-path", path, "--parent-path", parent, strconv.Itoa(id))
+	cmd := exec.Command("runc", args...)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("err:%v,out:%v\n", err, string(out))
 		return err
 	}
 	return nil
 }
 
-func doLastDump(id int,path,parent string)error  {
+func doLastDump(id int, path, parent string) error {
 	var (
 		err error
 	)
-	args:=[]string{"checkpoint","tcp-established"}
-	args=append(args,"--image-path",path,"--work-path",path,"--parent-path",parent,strconv.Itoa(id))
-	cmd:=exec.Command("runc",args...)
-	out,err:=cmd.Output()
-	if err!=nil {
-		log.Printf("err:%v,out:%v\n",err,string(out))
+	args := []string{"checkpoint", "tcp-established"}
+	args = append(args, "--image-path", path, "--work-path", path, "--parent-path", parent, strconv.Itoa(id))
+	cmd := exec.Command("runc", args...)
+	out, err := cmd.Output()
+	if err != nil {
+		log.Printf("err:%v,out:%v\n", err, string(out))
 		return err
 	}
 	return nil
-}
\ No newline at end of file
+}
diff --git a/supervisor/migration/preMigration.go b/supervisor/migration/preMigration.go
index 05dd008..8c387ed 100644
--- a/supervisor/migration/preMigration.go
+++ b/supervisor/migration/preMigration.go
@@ -12,7 +12,7 @@ import (
 	"time"
 )
 
-const remoteWriteVolume="/var/lib/migration/wvolume"
+const remoteWriteVolume = "/var/lib/migration/wvolume"
 const preVolume = "/var/lib/migration/mvolume"
 const remoteUpperDir = "/var/lib/migration/overlay2"
 
@@ -117,8 +117,8 @@ func (p *PreMigrationInTargetMachine) PreMkVolDir() error {
 			continue
 		}
 		tpath := filepath.Join(preVolume, p.Id, strconv.Itoa(i))
-		log.Printf("we remove wite dir first:%v\n",tpath)
-		if err=os.RemoveAll(tpath);err!=nil {
+		log.Printf("we remove wite dir first:%v\n", tpath)
+		if err = os.RemoveAll(tpath); err != nil {
 			log.Println(err)
 			return err
 		}
@@ -190,8 +190,8 @@ func (p *PreMigrationInTargetMachine) StartDockerContainer() error {
 	args = append(args, "--checkpoint", DumpAll, name)
 	cmd := exec.Command("docker", args...)
 	log.Printf("start docker cmd is %v\n", cmd.Args)
-	if bs,err:=cmd.CombinedOutput();err!=nil {
-		log.Printf("err:%v,message:%v\n",err,string(bs))
+	if bs, err := cmd.CombinedOutput(); err != nil {
+		log.Printf("err:%v,message:%v\n", err, string(bs))
 		return err
 	}
 	return nil
@@ -264,8 +264,8 @@ func (p *PreMigrationInTargetMachine) MountNfs() error {
 
 		cmd := exec.Command("mount", args...)
 		log.Printf("mount cmd is %v\n", cmd.Args)
-		if bs,err:=cmd.CombinedOutput();err!=nil {
-			log.Printf("err:%v,message:%v\n",err,string(bs))
+		if bs, err := cmd.CombinedOutput(); err != nil {
+			log.Printf("err:%v,message:%v\n", err, string(bs))
 			return err
 		}
 	}
diff --git a/supervisor/migration/remoteMigration.go b/supervisor/migration/remoteMigration.go
index a97c50b..496f55a 100644
--- a/supervisor/migration/remoteMigration.go
+++ b/supervisor/migration/remoteMigration.go
@@ -201,7 +201,7 @@ func (r *remoteMigration) PreRemoteMigration(id, upperid string, args []string)
 	}
 	pvol := make([]*types.Volumes, 0)
 	for _, v := range vol {
-		pvol = append(pvol, &types.Volumes{Dst: v.dst, Src: v.src,Iswrite:v.isWrite})
+		pvol = append(pvol, &types.Volumes{Dst: v.dst, Src: v.src, Iswrite: v.isWrite})
 	}
 	preRequest.Vol = pvol
 
diff --git a/supervisor/migration/utils_test.go b/supervisor/migration/utils_test.go
index f531601..ade51ed 100644
--- a/supervisor/migration/utils_test.go
+++ b/supervisor/migration/utils_test.go
@@ -129,7 +129,6 @@ func TestAbs(t *testing.T) {
 	println(absPath)
 }
 
-
 func TestRemoteMkdirAll(t *testing.T) {
 	c, err := GetSftpClient(LoginUser, LoginPasswd, "192.168.18.128", 22)
 	if err != nil {
@@ -225,32 +224,32 @@ func TestGetCName(t *testing.T) {
 
 func TestVolwatcher_StartWatch(t *testing.T) {
 	log.SetFlags(log.Lshortfile)
-	w:=Newvolwatcher(m1vol)
-	log.Printf("init res len is %v\n",len(w.GetRes()))
-	err:=w.StartWatch()
-	if err!=nil {
+	w := Newvolwatcher(m1vol)
+	log.Printf("init res len is %v\n", len(w.GetRes()))
+	err := w.StartWatch()
+	if err != nil {
 		log.Println(err)
 		t.FailNow()
 		return
 	}
 	log.Println("start watch")
-	time.Sleep(10*time.Second)
+	time.Sleep(10 * time.Second)
 	w.StopWatch()
-	time.Sleep(1*time.Second)
-	res:=w.GetRes()
-	for k,v:=range res {
-		log.Printf("%v,%v\n",k,v)
+	time.Sleep(1 * time.Second)
+	res := w.GetRes()
+	for k, v := range res {
+		log.Printf("%v,%v\n", k, v)
 	}
 
-	s,err:=w.GetStablefile()
-	if err!=nil {
+	s, err := w.GetStablefile()
+	if err != nil {
 		log.Println(err)
 		return
 	}
-	for _,v:=range s {
+	for _, v := range s {
 		log.Println(v)
 	}
-	log.Printf("len f is %v,s is %v,mp is %v\n",len(w.files),len(s),len(res))
+	log.Printf("len f is %v,s is %v,mp is %v\n", len(w.files), len(s), len(res))
 	//log.Println(s)
 	return
 }
diff --git a/supervisor/preMigration.go b/supervisor/preMigration.go
index 91cc627..1b8b9aa 100644
--- a/supervisor/preMigration.go
+++ b/supervisor/preMigration.go
@@ -21,8 +21,8 @@ type PreMigrationTask struct {
 }
 
 type Volumes struct {
-	Src,Dst string
-	IsWrite bool
+	Src, Dst string
+	IsWrite  bool
 }
 
 //在目的主机执行的准备操作
@@ -34,7 +34,7 @@ func (s *Supervisor) PreMigration(t *PreMigrationTask) error {
 	)
 	vols := make([]migration.Volumes, 0)
 	for _, v := range t.Vol {
-		v := migration.NewVolumes(v.Src, v.Dst,v.IsWrite)
+		v := migration.NewVolumes(v.Src, v.Dst, v.IsWrite)
 		vols = append(vols, v)
 	}