From b945d9128a0988ee006a8c743127cf1edc9cb47b Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 28 Nov 2018 13:06:32 -0500 Subject: Add locking to Sync() on containers Previously not needed as it only worked inside of Batch(), but now that it can be called anywhere we need to add mutual exclusion on its config changes. Signed-off-by: Matthew Heon --- libpod/container_api.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libpod') diff --git a/libpod/container_api.go b/libpod/container_api.go index ee060ad6a..09bc46905 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -685,6 +685,11 @@ func (c *Container) Batch(batchFunc func(*Container) error) error { // Running a manual Sync() ensures that container state will be correct in // such situations. func (c *Container) Sync() error { + if !c.batched { + c.lock.Lock() + defer c.lock.Unlock() + } + // If runtime knows about the container, update its status in runtime // And then save back to disk if (c.state.State != ContainerStateUnknown) && -- cgit v1.2.3-54-g00ecf