Add AutoDedup option to CriuOpts

thegrumpylion · thegrumpylion · commit da4a5a9515ee · 2017-08-18T01:21:42.000+02:00
Memory image deduplication, very useful for incremental dumps. See: https://criu.org/Memory_images_deduplication Signed-off-by: Nikolas Sepos <nikolas.sepos@gmail.com>
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -811,6 +811,7 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
 		FileLocks:       proto.Bool(criuOpts.FileLocks),
 		EmptyNs:         proto.Uint32(criuOpts.EmptyNs),
 		OrphanPtsMaster: proto.Bool(true),
+		AutoDedup:       proto.Bool(criuOpts.AutoDedup),
 	}
 
 	fcg := c.cgroupManager.GetPaths()["freezer"]
@@ -1012,6 +1013,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
 			FileLocks:       proto.Bool(criuOpts.FileLocks),
 			EmptyNs:         proto.Uint32(criuOpts.EmptyNs),
 			OrphanPtsMaster: proto.Bool(true),
+			AutoDedup:       proto.Bool(criuOpts.AutoDedup),
 		},
 	}
 
diff --git a/libcontainer/criu_opts_linux.go b/libcontainer/criu_opts_linux.go
@@ -34,4 +34,5 @@ type CriuOpts struct {
 	VethPairs               []VethPairName     // pass the veth to criu when restore
 	ManageCgroupsMode       cgMode             // dump or restore cgroup mode
 	EmptyNs                 uint32             // don't c/r properties for namespace from this mask
+	AutoDedup               bool               // auto deduplication for incremental dumps
 }

Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,7 @@ func (c linuxContainer) Checkpoint(criuOpts CriuOpts) error {`
`811`	`811`	`FileLocks: proto.Bool(criuOpts.FileLocks),`
`812`	`812`	`EmptyNs: proto.Uint32(criuOpts.EmptyNs),`
`813`	`813`	`OrphanPtsMaster: proto.Bool(true),`
	`814`	`+ AutoDedup: proto.Bool(criuOpts.AutoDedup),`
`814`	`815`	`}`
`815`	`816`
`816`	`817`	`fcg := c.cgroupManager.GetPaths()["freezer"]`
`@@ -1012,6 +1013,7 @@ func (c linuxContainer) Restore(process Process, criuOpts *CriuOpts) error {`
`1012`	`1013`	`FileLocks: proto.Bool(criuOpts.FileLocks),`
`1013`	`1014`	`EmptyNs: proto.Uint32(criuOpts.EmptyNs),`
`1014`	`1015`	`OrphanPtsMaster: proto.Bool(true),`
	`1016`	`+ AutoDedup: proto.Bool(criuOpts.AutoDedup),`
`1015`	`1017`	`},`
`1016`	`1018`	`}`
`1017`	`1019`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,5 @@ type CriuOpts struct {`
`34`	`34`	`VethPairs []VethPairName // pass the veth to criu when restore`
`35`	`35`	`ManageCgroupsMode cgMode // dump or restore cgroup mode`
`36`	`36`	`EmptyNs uint32 // don't c/r properties for namespace from this mask`
	`37`	`+ AutoDedup bool // auto deduplication for incremental dumps`
`37`	`38`	`}`