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

Delete expectations of a deleted rc instead of letting them expire

Browse Source
This commit is contained in:
Prashanth Balasubramanian
2015-05-08 14:16:58 -07:00
parent 520f84aa60
commit c0a8981b74
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/controller_utils.go
View File

@@ -63,6 +63,7 @@ var expKeyFunc = func(obj interface{}) (string, error) {
type RCExpectationsManager interface {
GetExpectations(rc *api.ReplicationController) (*PodExpectations, bool, error)
SatisfiedExpectations(rc *api.ReplicationController) bool
DeleteExpectations(rcKey string)
ExpectCreations(rc *api.ReplicationController, adds int) error
ExpectDeletions(rc *api.ReplicationController, dels int) error
CreationObserved(rc *api.ReplicationController)
@@ -87,6 +88,15 @@ func (r *RCExpectations) GetExpectations(rc *api.ReplicationController) (*PodExp
}
}
// DeleteExpectations deletes the expectations of the given RC from the TTLStore.
func (r *RCExpectations) DeleteExpectations(rcKey string) {
if podExp, exists, err := r.GetByKey(rcKey); err == nil && exists {
if err := r.Delete(podExp); err != nil {
glog.V(2).Infof("Error deleting expectations for rc %v: %v", rcKey, err)
}
}
}
// SatisfiedExpectations returns true if the replication manager has observed the required adds/dels
// for the given rc. Add/del counts are established by the rc at sync time, and updated as pods
// are observed by the replication manager's podController.