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

HACK temporary fix for test suite 

We leak open files when creating new c/storage stores (locks do
not close themselves, so the open FDs in the test suite increase
every time we use c/storage to load cached images for the tests).
Fix this temporarily by increasing rlimits on open files until we
can create a permanent fix next release.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #615
Approved by: baude
This commit is contained in:
Matthew Heon 2018-04-13 11:55:59 -04:00 committed by Atomic Bot
parent 4b25039cf4
commit b8394600d8
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/libpod_suite_test.go
View File

@ -7,6 +7,7 @@ import (
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"syscall"
"testing" "testing"
"time" "time"
@ -78,6 +79,19 @@ func TestLibpod(t *testing.T) {
CACHE_IMAGES = []string{} CACHE_IMAGES = []string{}
RESTORE_IMAGES = []string{} RESTORE_IMAGES = []string{}
} }
// HACK HACK HACK
// We leak file descriptors through c/storage locks and image caching
// Until we come up with a better solution, just set rlimits on open
// files really high
rlimits := new(syscall.Rlimit)
rlimits.Cur = 99999
rlimits.Max = 99999
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
fmt.Printf("Error setting new rlimits: %v", err)
os.Exit(1)
}
RegisterFailHandler(Fail) RegisterFailHandler(Fail)
RunSpecs(t, "Libpod Suite") RunSpecs(t, "Libpod Suite")
} }
@ -326,9 +340,6 @@ func (p *PodmanTest) RestoreArtifact(image string) error {
storeOptions.GraphRoot = p.CrioRoot storeOptions.GraphRoot = p.CrioRoot
storeOptions.RunRoot = p.RunRoot storeOptions.RunRoot = p.RunRoot
store, err := sstorage.GetStore(storeOptions) store, err := sstorage.GetStore(storeOptions)
defer store.Shutdown(false)
options := &copy.Options{}
if err != nil { if err != nil {
return errors.Errorf("error opening storage: %v", err) return errors.Errorf("error opening storage: %v", err)
} }
@ -337,6 +348,7 @@ func (p *PodmanTest) RestoreArtifact(image string) error {
}() }()
storage.Transport.SetStore(store) storage.Transport.SetStore(store)
ref, err := storage.Transport.ParseStoreReference(store, image) ref, err := storage.Transport.ParseStoreReference(store, image)
if err != nil { if err != nil {
return errors.Errorf("error parsing image name: %v", err) return errors.Errorf("error parsing image name: %v", err)
@ -348,6 +360,7 @@ func (p *PodmanTest) RestoreArtifact(image string) error {
if err != nil { if err != nil {
return errors.Errorf("error parsing image name %v: %v", image, err) return errors.Errorf("error parsing image name %v: %v", image, err)
} }
systemContext := types.SystemContext{ systemContext := types.SystemContext{
SignaturePolicyPath: p.SignaturePolicyPath, SignaturePolicyPath: p.SignaturePolicyPath,
} }
@ -355,6 +368,7 @@ func (p *PodmanTest) RestoreArtifact(image string) error {
if err != nil { if err != nil {
return errors.Errorf("error loading signature policy: %v", err) return errors.Errorf("error loading signature policy: %v", err)
} }
policyContext, err := signature.NewPolicyContext(policy) policyContext, err := signature.NewPolicyContext(policy)
if err != nil { if err != nil {
return errors.Errorf("error loading signature policy: %v", err) return errors.Errorf("error loading signature policy: %v", err)
@ -362,6 +376,8 @@ func (p *PodmanTest) RestoreArtifact(image string) error {
defer func() { defer func() {
_ = policyContext.Destroy() _ = policyContext.Destroy()
}() }()
options := &copy.Options{}
err = copy.Image(policyContext, ref, importRef, options) err = copy.Image(policyContext, ref, importRef, options)
if err != nil { if err != nil {
return errors.Errorf("error importing %s: %v", importFrom, err) return errors.Errorf("error importing %s: %v", importFrom, err)