From 3737b4e4e208b550d8aa255592b8893fbb0c0bef Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 17 Jun 2014 16:43:04 -0700 Subject: [PATCH] Fix bad lock handling. --- pkg/controller/replication_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/replication_controller.go b/pkg/controller/replication_controller.go index df4efad36f9..ce17106b311 100644 --- a/pkg/controller/replication_controller.go +++ b/pkg/controller/replication_controller.go @@ -149,6 +149,7 @@ func (rm *ReplicationManager) filterActivePods(pods []api.Pod) []api.Pod { func (rm *ReplicationManager) syncReplicationController(controllerSpec api.ReplicationController) error { rm.updateLock.Lock() + defer rm.updateLock.Unlock() podList, err := rm.kubeClient.ListPods(controllerSpec.DesiredState.ReplicasInSet) if err != nil { return err @@ -168,7 +169,6 @@ func (rm *ReplicationManager) syncReplicationController(controllerSpec api.Repli rm.podControl.deletePod(filteredList[i].ID) } } - rm.updateLock.Unlock() return nil }