version1

supervisor/migration/lazycopydir/manager.go

@@ -2,6 +2,7 @@ package lazycopydir
 
 import "time"
 
+
 //crwdir 挂载的nfs目录 monidiruper读写层目录 lazydir 惰复制目录
 func StartLazyCopy(crwdir, monidir, lazydir string) error {
 
@@ -36,3 +37,43 @@ func StartLazyCopy(crwdir, monidir, lazydir string) error {
 	glog.Println("finish lazycopy!")
 	return nil
 }
+
+func (replicator *LazyReplicator) Prelazy() error {
+	var (
+		err error
+	)
+
+	if err = replicator.Crawler(); err != nil {
+		glog.Println(err)
+		return err
+	}
+
+	go func() {
+		err = replicator.Monitor()
+		if err != nil {
+			glog.Println(err)
+			panic(err)
+		}
+	}()
+
+	return nil
+}
+func (replicator *LazyReplicator) Dolazycopy() error {
+
+	var (
+		err error
+	)
+
+	if err = replicator.Replicate(); err != nil {
+		glog.Println(err)
+		panic(err)
+	}
+
+	replicator.CancelMonitor()
+
+	time.Sleep(1 * time.Second)
+
+	glog.Println("finish lazycopy!")
+
+	return nil
+}

supervisor/migration/preMigration.go

@@ -24,6 +24,10 @@ type PreMigrationInTargetMachine struct {
 	SrcIp     string
 }
 
+var (
+	lazyreplicator=make([]*lazycopydir.LazyReplicator,0)
+)
+
 func (p *PreMigrationInTargetMachine) StartPre() error {
 	var (
 		err error
@@ -58,6 +62,12 @@ func (p *PreMigrationInTargetMachine) StartPre() error {
 		return err
 	}
 
+	glog.Println("pre lazycopy")
+	if err=p.StartPreLazyCopy();err!=nil {
+		glog.Println(err)
+		return err
+	}
+
 	glog.Println("start docker container")
 	if err=p.StartDockerContainer();err!=nil {
 		glog.Println(err)
@@ -252,22 +262,39 @@ func (p *PreMigrationInTargetMachine) PreLazyDir() error {
 	return nil
 }
 
-func (p *PreMigrationInTargetMachine) StartLazyCopy() error {
+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")
-		if err = lazycopydir.StartLazyCopy(crwdir, monidir, lazydir); err != nil {
+		r:=lazycopydir.NewLazyReplicator(crwdir,monidir,lazydir)
+		if err=r.Prelazy();err!=nil {
 			glog.Println(err)
 			return err
 		}
+		lazyreplicator=append(lazyreplicator,r)
+
 	}
-	glog.Printf("finish start 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 {
+			glog.Println(err)
+			return err
+		}
+	}
+	return nil
+}

supervisor/preMigration.go

@@ -3,6 +3,7 @@ package supervisor
 import (
 	"github.com/containerd/containerd/supervisor/migration"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 const preVolume = "/var/lib/migration/mvolume"
@@ -45,7 +46,7 @@ func (s *Supervisor) PreMigration(t *PreMigrationTask) error {
 		SrcIp:     t.SrcIp,
 	}
 
-	logrus.Println("start preMigration")
+	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