aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-22 04:24:11 +0200
committerGitHub <noreply@github.com>2019-06-22 04:24:11 +0200
commitd9bdd3c1e006b43e3524178fc6a84ab1ac3b2053 (patch)
tree187b515359a0688f6e45969a4be77811443d144d
parentaa21ec158afff2263d3f7a83fee75b275ff7122e (diff)
parentc233a12772e5f89bebde70d56f3d684170bafa1d (diff)
downloadpodman-d9bdd3c1e006b43e3524178fc6a84ab1ac3b2053.tar.gz
podman-d9bdd3c1e006b43e3524178fc6a84ab1ac3b2053.tar.bz2
podman-d9bdd3c1e006b43e3524178fc6a84ab1ac3b2053.zip
Merge pull request #3403 from mheon/more_lock_debugging
Add additional debugging when refreshing locks
-rw-r--r--libpod/container_internal.go2
-rw-r--r--libpod/pod_internal.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 3e2fd0c44..56fd27afb 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -509,7 +509,7 @@ func (c *Container) refresh() error {
// We need to pick up a new lock
lock, err := c.runtime.lockManager.AllocateAndRetrieveLock(c.config.LockID)
if err != nil {
- return errors.Wrapf(err, "error acquiring lock for container %s", c.ID())
+ return errors.Wrapf(err, "error acquiring lock %d for container %s", c.config.LockID, c.ID())
}
c.lock = lock
diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go
index 1fcb5b1a6..23359d841 100644
--- a/libpod/pod_internal.go
+++ b/libpod/pod_internal.go
@@ -58,7 +58,7 @@ func (p *Pod) refresh() error {
// Retrieve the pod's lock
lock, err := p.runtime.lockManager.AllocateAndRetrieveLock(p.config.LockID)
if err != nil {
- return errors.Wrapf(err, "error retrieving lock for pod %s", p.ID())
+ return errors.Wrapf(err, "error retrieving lock %d for pod %s", p.config.LockID, p.ID())
}
p.lock = lock