github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6418 from jdef/fix_6416

Browse Source 
fixes data race in node controller
This commit is contained in:
Yu-Ju Hong
2015-04-03 12:26:56 -07:00
parent 98bf5ae8cb 4d3a9e2203
commit 3d1dfd47ee
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/controller/nodecontroller.go
View File

@@ -161,7 +161,7 @@ func (nc *NodeController) Run(period time.Duration, syncNodeList, syncNodeStatus
// Start syncing node list from cloudprovider. // Start syncing node list from cloudprovider.
if syncNodeList && nc.isRunningCloudProvider() { if syncNodeList && nc.isRunningCloudProvider() {
go util.Forever(func() { go util.Forever(func() {
if err = nc.SyncCloudNodes(); err != nil { if err := nc.SyncCloudNodes(); err != nil {
glog.Errorf("Error syncing cloud: %v", err) glog.Errorf("Error syncing cloud: %v", err)
} }
}, period) }, period)
@@ -170,13 +170,13 @@ func (nc *NodeController) Run(period time.Duration, syncNodeList, syncNodeStatus
// Start syncing or monitoring node status. // Start syncing or monitoring node status.
if syncNodeStatus { if syncNodeStatus {
go util.Forever(func() { go util.Forever(func() {
if err = nc.SyncProbedNodeStatus(); err != nil { if err := nc.SyncProbedNodeStatus(); err != nil {
glog.Errorf("Error syncing status: %v", err) glog.Errorf("Error syncing status: %v", err)
} }
}, period) }, period)
} else { } else {
go util.Forever(func() { go util.Forever(func() {
if err = nc.MonitorNodeStatus(); err != nil { if err := nc.MonitorNodeStatus(); err != nil {
glog.Errorf("Error monitoring node status: %v", err) glog.Errorf("Error monitoring node status: %v", err)
} }
}, nodeMonitorPeriod) }, nodeMonitorPeriod)