From 783e1de5bb07b59299c6d2da30a109187f74efe6 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Thu, 5 Feb 2015 17:27:58 -0800 Subject: [PATCH] Add some locking to prevent go data race logic from tripping. --- pkg/registry/registrytest/controller.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/registry/registrytest/controller.go b/pkg/registry/registrytest/controller.go index 9e83ff8666..b36fd836a4 100644 --- a/pkg/registry/registrytest/controller.go +++ b/pkg/registry/registrytest/controller.go @@ -38,10 +38,14 @@ func (r *ControllerRegistry) SetError(err error) { } func (r *ControllerRegistry) ListControllers(ctx api.Context) (*api.ReplicationControllerList, error) { + r.Lock() + defer r.Unlock() return r.Controllers, r.Err } func (r *ControllerRegistry) GetController(ctx api.Context, ID string) (*api.ReplicationController, error) { + r.Lock() + defer r.Unlock() return &api.ReplicationController{}, r.Err } @@ -52,13 +56,19 @@ func (r *ControllerRegistry) CreateController(ctx api.Context, controller *api.R } func (r *ControllerRegistry) UpdateController(ctx api.Context, controller *api.ReplicationController) error { + r.Lock() + defer r.Unlock() return r.Err } func (r *ControllerRegistry) DeleteController(ctx api.Context, ID string) error { + r.Lock() + defer r.Unlock() return r.Err } func (r *ControllerRegistry) WatchControllers(ctx api.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) { + r.Lock() + defer r.Unlock() return nil, r.Err }