Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

stage1/init: return exit code 1 on error #2383

Merged
merged 3 commits into from
Apr 5, 2016
Merged

stage1/init: return exit code 1 on error #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e1a3b7
stage1/init: return exit code 1 on error
alban Apr 5, 2016
4a01748
fly/init: return exit code 1 on error
alban Apr 5, 2016
9e7d5c7
tests: expect return status 0 or 1 from stage1
alban Apr 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions stage1/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,42 +507,42 @@ func stage1() int {
flavor, _, err := stage1initcommon.GetFlavor(p)
if err != nil {
log.PrintE("failed to get stage1 flavor", err)
return 3
return 1
}

var n *networking.Networking
if netList.Contained() {
fps, err := forwardedPorts(p)
if err != nil {
log.Error(err)
return 6
return 1
}

n, err = networking.Setup(root, p.UUID, fps, netList, localConfig, flavor, debug)
if err != nil {
log.PrintE("failed to setup network", err)
return 6
return 1
}

if err = n.Save(); err != nil {
log.PrintE("failed to save networking state", err)
n.Teardown(flavor, debug)
return 6
return 1
}

if len(mdsToken) > 0 {
hostIP, err := n.GetDefaultHostIP()
if err != nil {
log.PrintE("failed to get default Host IP", err)
return 6
return 1
}

p.MetadataServiceURL = common.MetadataServicePublicURL(hostIP, mdsToken)
}
} else {
if flavor == "kvm" {
log.Print("flavor kvm requires private network configuration (try --net)")
return 6
return 1
}
if len(mdsToken) > 0 {
p.MetadataServiceURL = common.MetadataServicePublicURL(localhostIP, mdsToken)
Expand All @@ -551,12 +551,12 @@ func stage1() int {

if err = stage1initcommon.WriteDefaultTarget(p); err != nil {
log.PrintE("failed to write default.target", err)
return 2
return 1
}

if err = stage1initcommon.WritePrepareAppTemplate(p); err != nil {
log.PrintE("failed to write prepare-app service template", err)
return 2
return 1
}

if err := stage1initcommon.SetJournalPermissions(p); err != nil {
Expand All @@ -566,19 +566,19 @@ func stage1() int {
if flavor == "kvm" {
if err := KvmPodToSystemd(p, n); err != nil {
log.PrintE("failed to configure systemd for kvm", err)
return 2
return 1
}
}

if err = stage1initcommon.PodToSystemd(p, interactive, flavor, privateUsers); err != nil {
log.PrintE("failed to configure systemd", err)
return 2
return 1
}

args, env, err := getArgsEnv(p, flavor, debug, n)
if err != nil {
log.Error(err)
return 3
return 1
}

// create a separate mount namespace so the cgroup filesystems
Expand All @@ -602,13 +602,13 @@ func stage1() int {
enabledCgroups, err := cgroup.GetEnabledCgroups()
if err != nil {
log.FatalE("error getting cgroups", err)
return 5
return 1
}

// mount host cgroups in the rkt mount namespace
if err := mountHostCgroups(enabledCgroups); err != nil {
log.FatalE("couldn't mount the host cgroups", err)
return 5
return 1
}

var serviceNames []string
Expand All @@ -621,23 +621,23 @@ func stage1() int {
if err == nil {
if err := mountContainerCgroups(s1Root, enabledCgroups, subcgroup, serviceNames); err != nil {
log.PrintE("couldn't mount the container cgroups", err)
return 5
return 1
}
} else {
log.PrintE("continuing with per-app isolators disabled", err)
}

if err = stage1common.WritePpid(os.Getpid()); err != nil {
log.Error(err)
return 4
return 1
}

err = stage1common.WithClearedCloExec(lfd, func() error {
return syscall.Exec(args[0], args, env)
})
if err != nil {
log.PrintE(fmt.Sprintf("failed to execute %q", args[0]), err)
return 7
return 1
}

return 0
Expand Down
4 changes: 2 additions & 2 deletions stage1_fly/run/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ func stage1() int {

if err = stage1common.WritePpid(os.Getpid()); err != nil {
log.Error(err)
return 4
return 1
}

diag.Printf("chroot to %q", rfs)
Expand All @@ -354,7 +354,7 @@ func stage1() int {
})
if err != nil {
log.PrintE(fmt.Sprintf("can't execute %q", args[0]), err)
return 7
return 1
}

return 0
Expand Down
4 changes: 2 additions & 2 deletions tests/rkt_mount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ func TestMountSymlink(t *testing.T) {
"/dir1/../../../foo",
"/dir2/foo",
"path escapes app's root",
3,
1,
},
// '/dir1/link_invalid' is an invalid link because it tries to escape rootfs.
{
"/dir1/link_invalid/foo",
"/dir2/foo",
"escapes app's root with value",
3,
1,
},
}

Expand Down
8 changes: 4 additions & 4 deletions tests/rkt_run_pod_manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ func TestPodManifest(t *testing.T) {
},
},
},
2,
1,
`"user2" user not found`,
"",
},
Expand All @@ -666,7 +666,7 @@ func TestPodManifest(t *testing.T) {
},
},
},
2,
1,
`"group2" group not found`,
"",
},
Expand Down Expand Up @@ -708,7 +708,7 @@ func TestPodManifest(t *testing.T) {
},
},
},
2,
1,
`no such file or directory`,
"",
},
Expand All @@ -729,7 +729,7 @@ func TestPodManifest(t *testing.T) {
},
},
},
2,
1,
`no such file or directory`,
"",
},
Expand Down