erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-14 09:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

test/e2e: fix "Too many RemoteSocket collisions" panic

Browse source 
The panic occurred because PodmanTestCreateUtil tried to create lock
files in /run/podman before the directory existed. The directory was
only created later in StartRemoteService(), causing all 1000 create
attempts to fail with "no such file or directory" rather than the
expected "file exists" collision error.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
Lokesh Mandvekar 2026-02-02 17:09:23 +05:30
parent 5b8bf77136
commit 166b7bea75
No known key found for this signature in database
GPG key ID: 1C1EDD7CC7C3A0DD
1 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/e2e/common_test.go
View file

@ -194,6 +194,28 @@ var _ = SynchronizedAfterSuite(func() {},
removeCache()
})
// cleanupStaleLockFiles removes orphaned lock files to prevent
// accumulation from crashed/interrupted tests
func cleanupStaleLockFiles(pathPrefix string) {
pattern := fmt.Sprintf("%s-*.sock-lock", pathPrefix)
matches, err := filepath.Glob(pattern)
if err != nil {
return
}
for _, lockFile := range matches {
// Extract the UUID from the lock file name to find corresponding socket
// Lock file format: {pathPrefix}-{uuid}.sock-lock
// Socket file format: {pathPrefix}-{uuid}.sock
socketPath := strings.TrimSuffix(lockFile, "-lock")
// If the socket doesn't exist, the lock file is orphaned
if _, err := os.Stat(socketPath); os.IsNotExist(err) {
_ = os.Remove(lockFile)
}
}
}
// PodmanTestCreate creates a PodmanTestIntegration instance for the tests
func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
var podmanRemoteBinary string
@ -299,16 +321,30 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
if remote {
var pathPrefix string
var dirPath string
if !isRootless() {
dirPath = "/run/podman"
pathPrefix = "/run/podman/podman"
} else {
runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
dirPath = runtimeDir
pathPrefix = filepath.Join(runtimeDir, "podman")
}
// Ensure the directory exists before creating lock files
if err := os.MkdirAll(dirPath, 0755); err != nil {
panic(fmt.Sprintf("Failed to create directory %s: %v", dirPath, err))
}
// We want to avoid collisions in socket paths, but using the
// socket directly for a collision check doesn’t work; bind(2) on AF_UNIX
// socket directly for a collision check doesn't work; bind(2) on AF_UNIX
// creates the file, and we need to pass a unique path now before the bind(2)
// happens. So, use a podman-%s.sock-lock empty file as a marker.
// Clean up stale lock files from crashed/interrupted tests
// to prevent accumulation that causes collisions
cleanupStaleLockFiles(pathPrefix)
tries := 0
for {
uuid := stringid.GenerateRandomID()
@ -322,7 +358,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
}
tries++
if tries >= 1000 {
panic("Too many RemoteSocket collisions")
panic(fmt.Sprintf("Too many RemoteSocket collisions (last error: %v)", err))
}
}
}