opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2089 from rhatdan/locks

Browse Source 
Rootless with shmlocks was not working.
This commit is contained in:
OpenShift Merge Robot
2019-01-06 23:16:55 -08:00
committed by GitHub
parent b83b07cb47 a76256834a
commit 1e4db4b0b8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/lock/shm/shm_lock.go
View File

@ -48,7 +48,7 @@ func CreateSHMLock(path string, numLocks uint32) (*SHMLocks, error) {
lockStruct := C.setup_lock_shm(cPath, C.uint32_t(numLocks), &errCode) lockStruct := C.setup_lock_shm(cPath, C.uint32_t(numLocks), &errCode)
if lockStruct == nil { if lockStruct == nil {
// We got a null pointer, so something errored // We got a null pointer, so something errored
return nil, syscall.Errno(-1 * errCode) return nil, errors.Wrapf(syscall.Errno(-1*errCode), "failed to create %d locks in %s", numLocks, path)
} }
locks.lockStruct = lockStruct locks.lockStruct = lockStruct
@ -77,7 +77,7 @@ func OpenSHMLock(path string, numLocks uint32) (*SHMLocks, error) {
lockStruct := C.open_lock_shm(cPath, C.uint32_t(numLocks), &errCode) lockStruct := C.open_lock_shm(cPath, C.uint32_t(numLocks), &errCode)
if lockStruct == nil { if lockStruct == nil {
// We got a null pointer, so something errored // We got a null pointer, so something errored
return nil, syscall.Errno(-1 * errCode) return nil, errors.Wrapf(syscall.Errno(-1*errCode), "failed to open %d locks in %s", numLocks, path)
} }
locks.lockStruct = lockStruct locks.lockStruct = lockStruct

7
libpod/runtime.go
View File

@ -1,6 +1,7 @@
package libpod package libpod
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
@ -695,7 +696,7 @@ func makeRuntime(runtime *Runtime) (err error) {
var manager lock.Manager var manager lock.Manager
lockPath := DefaultSHMLockPath lockPath := DefaultSHMLockPath
if rootless.IsRootless() { if rootless.IsRootless() {
lockPath = DefaultRootlessSHMLockPath lockPath = fmt.Sprintf("%s_%d", DefaultRootlessSHMLockPath, rootless.GetRootlessUID())
} }
if doRefresh { if doRefresh {
// If SHM locks already exist, delete them and reinitialize // If SHM locks already exist, delete them and reinitialize
@ -705,12 +706,12 @@ func makeRuntime(runtime *Runtime) (err error) {
manager, err = lock.NewSHMLockManager(lockPath, runtime.config.NumLocks) manager, err = lock.NewSHMLockManager(lockPath, runtime.config.NumLocks)
if err != nil { if err != nil {
return errors.Wrapf(err, "error creating SHM locks for libpod") return err
} }
} else { } else {
manager, err = lock.OpenSHMLockManager(lockPath, runtime.config.NumLocks) manager, err = lock.OpenSHMLockManager(lockPath, runtime.config.NumLocks)
if err != nil { if err != nil {
return errors.Wrapf(err, "error opening libpod SHM locks") return err
} }
} }
runtime.lockManager = manager runtime.lockManager = manager