f1717baaaa
The UpdateNodeStatuses code stops too early in case there is an error when calling updateNodeStatus. It will return immediately which means any remaining node won't have its update status put back to true. Looking at the call sites for UpdateNodeStatuses, it appears this is not the only issue. If the lister call fails with anything but a Not Found error, it's silently ignored which is wrong in the detach path. Also the reconciler detach path calls UpdateNodeStatuses but the real intent is to only update the node currently processed in the loop and not proceed with the detach call if there is an error updating that specifi node volumesAttached property. With the current implementation, it will not proceed if there is an error updating another node (which is not completely bad but not ideal) and worse it will proceed if there is a lister error on that node which means the node volumesAttached property won't have been updated. To fix those issues, introduce the following changes: - [node_status_updater] introduce UpdateNodeStatusForNode which does what UpdateNodeStatuses does but only for the provided node - [node_status_updater] if the node lister call fails for anything but a Not Found error, we will return an error, not ignore it - [node_status_updater] if the update of a node volumesAttached properties fails we continue processing the other nodes - [actual_state_of_world] introduce GetVolumesToReportAttachedForNode which does what GetVolumesToReportAttached but for the node whose name is provided it returns a bool which indicates if the node in question needs an update as well as the volumesAttached list. It is used by UpdateNodeStatusForNode - [actual_state_of_world] use write lock in updateNodeStatusUpdateNeeded, we're modifying the map content - [reconciler] use UpdateNodeStatusForNode in the detach loop
49 lines
1.2 KiB
Go
49 lines
1.2 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package statusupdater
|
|
|
|
import (
|
|
"fmt"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
)
|
|
|
|
func NewFakeNodeStatusUpdater(returnError bool) NodeStatusUpdater {
|
|
return &fakeNodeStatusUpdater{
|
|
returnError: returnError,
|
|
}
|
|
}
|
|
|
|
type fakeNodeStatusUpdater struct {
|
|
returnError bool
|
|
}
|
|
|
|
func (fnsu *fakeNodeStatusUpdater) UpdateNodeStatuses() error {
|
|
if fnsu.returnError {
|
|
return fmt.Errorf("fake error on update node status")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (fnsu *fakeNodeStatusUpdater) UpdateNodeStatusForNode(nodeName types.NodeName) error {
|
|
if fnsu.returnError {
|
|
return fmt.Errorf("fake error on update node status")
|
|
}
|
|
|
|
return nil
|
|
}
|