Merge pull request #1683 from vikaschoudhary16/runc-systemd-race

Fix race against systemd
opencontainers · Jan 9, 2018 · 96086e5 · 96086e5
2 parents e6516b3 + d5b4a3e
commit 96086e5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -295,10 +295,13 @@ func (m *Manager) Apply(pid int) error {
 		}
 	}
 
-	if _, err := theConn.StartTransientUnit(unitName, "replace", properties, nil); err != nil && !isUnitExists(err) {
+	statusChan := make(chan string)
+	if _, err := theConn.StartTransientUnit(unitName, "replace", properties, statusChan); err != nil && !isUnitExists(err) {
 		return err
 	}
 
+	<-statusChan
+
 	if err := joinCgroups(c, pid); err != nil {
 		return err
 	}