jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

checkCriuVersion: switch to version using int 

The checkCriuVersion function used a string to specify the minimum
version required. This is more comfortable for an external interface
but for an internal function this added unnecessary complexity. This
changes to version string like '1.5.2' to an integer like 10502. This is
already the format used internally in the function.

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber 2017-07-24 16:03:50 +00:00
parent 882d8eaba6
commit b6c47281db
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libcontainer/container_linux.go
View File

@ -546,7 +546,8 @@ func (c *linuxContainer) checkCriuFeatures(criuOpts *CriuOpts, rpcOpts *criurpc.
var t criurpc.CriuReqType var t criurpc.CriuReqType
t = criurpc.CriuReqType_FEATURE_CHECK t = criurpc.CriuReqType_FEATURE_CHECK
if err := c.checkCriuVersion("1.8"); err != nil { // criu 1.8 => 10800
if err := c.checkCriuVersion(10800); err != nil {
// Feature checking was introduced with CRIU 1.8. // Feature checking was introduced with CRIU 1.8.
// Ignore the feature check if an older CRIU version is used // Ignore the feature check if an older CRIU version is used
// and just act as before. // and just act as before.
@ -590,17 +591,8 @@ func (c *linuxContainer) checkCriuFeatures(criuOpts *CriuOpts, rpcOpts *criurpc.
} }
// checkCriuVersion checks Criu version greater than or equal to minVersion // checkCriuVersion checks Criu version greater than or equal to minVersion
func (c *linuxContainer) checkCriuVersion(minVersion string) error { func (c *linuxContainer) checkCriuVersion(minVersion int) error {
var x, y, z, versionReq int var x, y, z int
_, err := fmt.Sscanf(minVersion, "%d.%d.%d\n", &x, &y, &z) // 1.5.2
if err != nil {
_, err = fmt.Sscanf(minVersion, "Version: %d.%d\n", &x, &y) // 1.6
if err != nil {
return fmt.Errorf("Unable to parse the CRIU min version: %s", minVersion)
}
}
versionReq = x*10000 + y*100 + z
out, err := exec.Command(c.criuPath, "-V").Output() out, err := exec.Command(c.criuPath, "-V").Output()
if err != nil { if err != nil {
@ -642,8 +634,8 @@ func (c *linuxContainer) checkCriuVersion(minVersion string) error {
c.criuVersion = x*10000 + y*100 + z c.criuVersion = x*10000 + y*100 + z
if c.criuVersion < versionReq { if c.criuVersion < minVersion {
return fmt.Errorf("CRIU version %d must be %d or higher", c.criuVersion, versionReq) return fmt.Errorf("CRIU version %d must be %d or higher", c.criuVersion, minVersion)
} }
return nil return nil
@ -698,7 +690,8 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
return fmt.Errorf("cannot checkpoint a rootless container") return fmt.Errorf("cannot checkpoint a rootless container")
} }
if err := c.checkCriuVersion("1.5.2"); err != nil { // criu 1.5.2 => 10502
if err := c.checkCriuVersion(10502); err != nil {
return err return err
} }
@ -771,7 +764,8 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
// append optional manage cgroups mode // append optional manage cgroups mode
if criuOpts.ManageCgroupsMode != 0 { if criuOpts.ManageCgroupsMode != 0 {
if err := c.checkCriuVersion("1.7"); err != nil { // criu 1.7 => 10700
if err := c.checkCriuVersion(10700); err != nil {
return err return err
} }
mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode) mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode)
@ -885,7 +879,8 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
return fmt.Errorf("cannot restore a rootless container") return fmt.Errorf("cannot restore a rootless container")
} }
if err := c.checkCriuVersion("1.5.2"); err != nil { // criu 1.5.2 => 10502
if err := c.checkCriuVersion(10502); err != nil {
return err return err
} }
if criuOpts.WorkDirectory == "" { if criuOpts.WorkDirectory == "" {
@ -981,7 +976,8 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
// append optional manage cgroups mode // append optional manage cgroups mode
if criuOpts.ManageCgroupsMode != 0 { if criuOpts.ManageCgroupsMode != 0 {
if err := c.checkCriuVersion("1.7"); err != nil { // criu 1.7 => 10700
if err := c.checkCriuVersion(10700); err != nil {
return err return err
} }
mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode) mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode)