Take cluster lock as late as possible

fluxcd · Jan 2, 2018 · 8c3f720 · 8c3f720
1 parent c113bd1
commit 8c3f720
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cluster/kubernetes/kubernetes.go b/cluster/kubernetes/kubernetes.go
@@ -215,8 +215,6 @@ func (c *Cluster) AllControllers(namespace string) (res []cluster.Controller, er
 // Sync performs the given actions on resources. Operations are
 // asynchronous, but serialised.
 func (c *Cluster) Sync(spec cluster.SyncDef) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
 	logger := log.With(c.logger, "method", "Sync")
 
 	cs := makeChangeSet()
@@ -243,6 +241,9 @@ func (c *Cluster) Sync(spec cluster.SyncDef) error {
 			}
 		}
 	}
+
+	c.mu.Lock()
+	defer c.mu.Unlock()
 	c.applier.apply(logger, cs, errs)
 	if len(errs) != 0 {
 		return errs