containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not use an events backend when restoring images 

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon 2019-07-17 15:28:40 -04:00
parent cdd5639d56
commit 318438fcb3
6 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/common_test.go
View File

@ -413,7 +413,7 @@ func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers
// PodmanPID execs podman and returns its PID // PodmanPID execs podman and returns its PID
func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) {
podmanOptions := p.MakeOptions(args) podmanOptions := p.MakeOptions(args, false)
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
command := exec.Command(p.PodmanBinary, podmanOptions...) command := exec.Command(p.PodmanBinary, podmanOptions...)
session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)

15
test/e2e/libpod_suite_remoteclient_test.go
View File

@ -30,13 +30,20 @@ func SkipIfRootless() {
// Podman is the exec call to podman on the filesystem // Podman is the exec call to podman on the filesystem
func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, false) podmanSession := p.PodmanBase(args, false, false)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
// PodmanNoCache calls podman with out adding the imagecache // PodmanNoCache calls podman with out adding the imagecache
func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true) podmanSession := p.PodmanBase(args, true, false)
return &PodmanSessionIntegration{podmanSession}
}
// PodmanNoEvents calls the Podman command without an imagecache and without an
// events backend. It is used mostly for caching and uncaching images.
func (p *PodmanTestIntegration) PodmanNoEvents(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true, true)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
@ -135,7 +142,7 @@ func (p *PodmanTestIntegration) StopVarlink() {
} }
//MakeOptions assembles all the podman main options //MakeOptions assembles all the podman main options
func (p *PodmanTestIntegration) makeOptions(args []string) []string { func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []string {
return args return args
} }
@ -156,7 +163,7 @@ func (p *PodmanTestIntegration) RestoreArtifactToCache(image string) error {
dest := strings.Split(image, "/") dest := strings.Split(image, "/")
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
p.CrioRoot = p.ImageCacheDir p.CrioRoot = p.ImageCacheDir
restore := p.PodmanNoCache([]string{"load", "-q", "-i", destName}) restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName})
restore.WaitWithDefaultTimeout() restore.WaitWithDefaultTimeout()
return nil return nil
} }

28
test/e2e/libpod_suite_test.go
View File

@ -23,19 +23,26 @@ func SkipIfRootless() {
// Podman is the exec call to podman on the filesystem // Podman is the exec call to podman on the filesystem
func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, false) podmanSession := p.PodmanBase(args, false, false)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
// PodmanNoCache calls the podman command with no configured imagecache // PodmanNoCache calls the podman command with no configured imagecache
func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) PodmanNoCache(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true) podmanSession := p.PodmanBase(args, true, false)
return &PodmanSessionIntegration{podmanSession}
}
// PodmanNoEvents calls the Podman command without an imagecache and without an
// events backend. It is used mostly for caching and uncaching images.
func (p *PodmanTestIntegration) PodmanNoEvents(args []string) *PodmanSessionIntegration {
podmanSession := p.PodmanBase(args, true, true)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
// PodmanAsUser is the exec call to podman on the filesystem with the specified uid/gid and environment // PodmanAsUser is the exec call to podman on the filesystem with the specified uid/gid and environment
func (p *PodmanTestIntegration) PodmanAsUser(args []string, uid, gid uint32, cwd string, env []string) *PodmanSessionIntegration { func (p *PodmanTestIntegration) PodmanAsUser(args []string, uid, gid uint32, cwd string, env []string) *PodmanSessionIntegration {
podmanSession := p.PodmanAsUserBase(args, uid, gid, cwd, env, false) podmanSession := p.PodmanAsUserBase(args, uid, gid, cwd, env, false, false)
return &PodmanSessionIntegration{podmanSession} return &PodmanSessionIntegration{podmanSession}
} }
@ -59,14 +66,19 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration {
} }
// MakeOptions assembles all the podman main options // MakeOptions assembles all the podman main options
func (p *PodmanTestIntegration) makeOptions(args []string) []string { func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []string {
var debug string var debug string
if _, ok := os.LookupEnv("DEBUG"); ok { if _, ok := os.LookupEnv("DEBUG"); ok {
debug = "--log-level=debug --syslog=true " debug = "--log-level=debug --syslog=true "
} }
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend file", eventsType := "file"
debug, p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager, p.TmpDir), " ") if noEvents {
eventsType = "null"
}
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
debug, p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ")
if os.Getenv("HOOK_OPTION") != "" { if os.Getenv("HOOK_OPTION") != "" {
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
} }
@ -81,7 +93,7 @@ func (p *PodmanTestIntegration) RestoreArtifact(image string) error {
fmt.Printf("Restoring %s...\n", image) fmt.Printf("Restoring %s...\n", image)
dest := strings.Split(image, "/") dest := strings.Split(image, "/")
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
restore := p.PodmanNoCache([]string{"load", "-q", "-i", destName}) restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName})
restore.Wait(90) restore.Wait(90)
return nil return nil
} }
@ -93,7 +105,7 @@ func (p *PodmanTestIntegration) RestoreArtifactToCache(image string) error {
destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1)) destName := fmt.Sprintf("/tmp/%s.tar", strings.Replace(strings.Join(strings.Split(dest[len(dest)-1], "/"), ""), ":", "-", -1))
p.CrioRoot = p.ImageCacheDir p.CrioRoot = p.ImageCacheDir
restore := p.PodmanNoCache([]string{"load", "-q", "-i", destName}) restore := p.PodmanNoEvents([]string{"load", "-q", "-i", destName})
restore.WaitWithDefaultTimeout() restore.WaitWithDefaultTimeout()
return nil return nil
} }

2
test/utils/podmantest_test.go
View File

@ -23,7 +23,7 @@ var _ = Describe("PodmanTest test", func() {
FakeOutputs["check"] = []string{"check"} FakeOutputs["check"] = []string{"check"}
os.Setenv("HOOK_OPTION", "hook_option") os.Setenv("HOOK_OPTION", "hook_option")
env := os.Environ() env := os.Environ()
session := podmanTest.PodmanAsUserBase([]string{"check"}, 1000, 1000, "", env, true) session := podmanTest.PodmanAsUserBase([]string{"check"}, 1000, 1000, "", env, true, false)
os.Unsetenv("HOOK_OPTION") os.Unsetenv("HOOK_OPTION")
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.Command.Process).ShouldNot(BeNil()) Expect(session.Command.Process).ShouldNot(BeNil())

28
test/utils/utils.go
View File

@ -26,14 +26,14 @@ var (
// PodmanTestCommon contains common functions will be updated later in // PodmanTestCommon contains common functions will be updated later in
// the inheritance structs // the inheritance structs
type PodmanTestCommon interface { type PodmanTestCommon interface {
MakeOptions(args []string) []string MakeOptions(args []string, noEvents bool) []string
WaitForContainer() bool WaitForContainer() bool
WaitContainerReady(id string, expStr string, timeout int, step int) bool WaitContainerReady(id string, expStr string, timeout int, step int) bool
} }
// PodmanTest struct for command line options // PodmanTest struct for command line options
type PodmanTest struct { type PodmanTest struct {
PodmanMakeOptions func(args []string) []string PodmanMakeOptions func(args []string, noEvents bool) []string
PodmanBinary string PodmanBinary string
ArtifactPath string ArtifactPath string
TempDir string TempDir string
@ -59,15 +59,15 @@ type HostOS struct {
} }
// MakeOptions assembles all podman options // MakeOptions assembles all podman options
func (p *PodmanTest) MakeOptions(args []string) []string { func (p *PodmanTest) MakeOptions(args []string, noEvents bool) []string {
return p.PodmanMakeOptions(args) return p.PodmanMakeOptions(args, noEvents)
} }
// PodmanAsUserBase exec podman as user. uid and gid is set for credentials usage. env is used // PodmanAsUserBase exec podman as user. uid and gid is set for credentials usage. env is used
// to record the env for debugging // to record the env for debugging
func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, nocache bool) *PodmanSession { func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string, env []string, nocache, noEvents bool) *PodmanSession {
var command *exec.Cmd var command *exec.Cmd
podmanOptions := p.MakeOptions(args) podmanOptions := p.MakeOptions(args, noEvents)
podmanBinary := p.PodmanBinary podmanBinary := p.PodmanBinary
if p.RemoteTest { if p.RemoteTest {
podmanBinary = p.RemotePodmanBinary podmanBinary = p.RemotePodmanBinary
@ -105,8 +105,8 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string
} }
// PodmanBase exec podman with default env. // PodmanBase exec podman with default env.
func (p *PodmanTest) PodmanBase(args []string, nocache bool) *PodmanSession { func (p *PodmanTest) PodmanBase(args []string, nocache, noEvents bool) *PodmanSession {
return p.PodmanAsUserBase(args, 0, 0, "", nil, nocache) return p.PodmanAsUserBase(args, 0, 0, "", nil, nocache, noEvents)
} }
// WaitForContainer waits on a started container // WaitForContainer waits on a started container
@ -124,7 +124,7 @@ func (p *PodmanTest) WaitForContainer() bool {
// containers are currently running. // containers are currently running.
func (p *PodmanTest) NumberOfContainersRunning() int { func (p *PodmanTest) NumberOfContainersRunning() int {
var containers []string var containers []string
ps := p.PodmanBase([]string{"ps", "-q"}, true) ps := p.PodmanBase([]string{"ps", "-q"}, true, false)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -139,7 +139,7 @@ func (p *PodmanTest) NumberOfContainersRunning() int {
// containers are currently defined. // containers are currently defined.
func (p *PodmanTest) NumberOfContainers() int { func (p *PodmanTest) NumberOfContainers() int {
var containers []string var containers []string
ps := p.PodmanBase([]string{"ps", "-aq"}, true) ps := p.PodmanBase([]string{"ps", "-aq"}, true, false)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -154,7 +154,7 @@ func (p *PodmanTest) NumberOfContainers() int {
// pods are currently defined. // pods are currently defined.
func (p *PodmanTest) NumberOfPods() int { func (p *PodmanTest) NumberOfPods() int {
var pods []string var pods []string
ps := p.PodmanBase([]string{"pod", "ps", "-q"}, true) ps := p.PodmanBase([]string{"pod", "ps", "-q"}, true, false)
ps.WaitWithDefaultTimeout() ps.WaitWithDefaultTimeout()
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
for _, i := range ps.OutputToStringArray() { for _, i := range ps.OutputToStringArray() {
@ -170,7 +170,7 @@ func (p *PodmanTest) NumberOfPods() int {
func (p *PodmanTest) GetContainerStatus() string { func (p *PodmanTest) GetContainerStatus() string {
var podmanArgs = []string{"ps"} var podmanArgs = []string{"ps"}
podmanArgs = append(podmanArgs, "--all", "--format={{.Status}}") podmanArgs = append(podmanArgs, "--all", "--format={{.Status}}")
session := p.PodmanBase(podmanArgs, true) session := p.PodmanBase(podmanArgs, true, false)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
return session.OutputToString() return session.OutputToString()
} }
@ -178,7 +178,7 @@ func (p *PodmanTest) GetContainerStatus() string {
// WaitContainerReady waits process or service inside container start, and ready to be used. // WaitContainerReady waits process or service inside container start, and ready to be used.
func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, step int) bool { func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, step int) bool {
startTime := time.Now() startTime := time.Now()
s := p.PodmanBase([]string{"logs", id}, true) s := p.PodmanBase([]string{"logs", id}, true, false)
s.WaitWithDefaultTimeout() s.WaitWithDefaultTimeout()
for { for {
@ -191,7 +191,7 @@ func (p *PodmanTest) WaitContainerReady(id string, expStr string, timeout int, s
return true return true
} }
time.Sleep(time.Duration(step) * time.Second) time.Sleep(time.Duration(step) * time.Second)
s = p.PodmanBase([]string{"logs", id}, true) s = p.PodmanBase([]string{"logs", id}, true, false)
s.WaitWithDefaultTimeout() s.WaitWithDefaultTimeout()
} }
} }

2
test/utils/utils_suite_test.go
View File

@ -32,7 +32,7 @@ func FakePodmanTestCreate() *FakePodmanTest {
return p return p
} }
func (p *FakePodmanTest) makeOptions(args []string) []string { func (p *FakePodmanTest) makeOptions(args []string, noEvents bool) []string {
return FakeOutputs[strings.Join(args, " ")] return FakeOutputs[strings.Join(args, " ")]
} }