github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4200 from brendandburns/race 

Add some locking to prevent go data race logic from tripping.
pull/6/head
Jeff Lowdermilk 2015-02-06 12:29:56 -08:00
parent fc06acdd2b 783e1de5bb
commit 9c7817577b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/registry/registrytest/controller.go
View File

@ -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
}