github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31421 from wojtek-t/fix_kubectl_scale

Browse Source 
Automatic merge from submit-queue

Fix scale x->x in kubectl for ReplicationController

Fix #31374

This fixes problem introduced in #31051 (which in turn was fixing a different problem).

@lavalamp - FYI
This commit is contained in:
Kubernetes Submit Queue 2016-08-25 05:40:06 -07:00 committed by GitHub
commit ab8d4525bb
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkg/kubectl/scale.go
View File

@ -198,27 +198,45 @@ func (scaler *ReplicationControllerScaler) Scale(namespace, name string, newSize
return err return err
} }
if waitForReplicas != nil { if waitForReplicas != nil {
watchOptions := api.ListOptions{FieldSelector: fields.OneTermEqualSelector("metadata.name", name), ResourceVersion: updatedResourceVersion} checkRC := func(rc *api.ReplicationController) bool {
watcher, err := scaler.c.ReplicationControllers(namespace).Watch(watchOptions) if uint(rc.Spec.Replicas) != newSize {
// the size is changed by other party. Don't need to wait for the new change to complete.
return true
}
return rc.Status.ObservedGeneration >= rc.Generation && rc.Status.Replicas == rc.Spec.Replicas
}
// If number of replicas doesn't change, then the update may not event
// be sent to underlying databse (we don't send no-op changes).
// In such case, <updatedResourceVersion> will have value of the most
// recent update (which may be far in the past) so we may get "too old
// RV" error from watch or potentially no ReplicationController events
// will be deliver, since it may already be in the expected state.
// To protect from these two, we first issue Get() to ensure that we
// are not already in the expected state.
currentRC, err := scaler.c.ReplicationControllers(namespace).Get(name)
if err != nil { if err != nil {
return err return err
} }
_, err = watch.Until(waitForReplicas.Timeout, watcher, func(event watch.Event) (bool, error) { if !checkRC(currentRC) {
if event.Type != watch.Added && event.Type != watch.Modified { watchOptions := api.ListOptions{
return false, nil FieldSelector: fields.OneTermEqualSelector("metadata.name", name),
ResourceVersion: updatedResourceVersion,
} }
watcher, err := scaler.c.ReplicationControllers(namespace).Watch(watchOptions)
rc := event.Object.(*api.ReplicationController) if err != nil {
if uint(rc.Spec.Replicas) != newSize { return err
// the size is changed by other party. Don't need to wait for the new change to complete.
return true, nil
} }
return rc.Status.ObservedGeneration >= rc.Generation && rc.Status.Replicas == rc.Spec.Replicas, nil _, err = watch.Until(waitForReplicas.Timeout, watcher, func(event watch.Event) (bool, error) {
}) if event.Type != watch.Added && event.Type != watch.Modified {
if err == wait.ErrWaitTimeout { return false, nil
return fmt.Errorf("timed out waiting for %q to be synced", name) }
return checkRC(event.Object.(*api.ReplicationController)), nil
})
if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name)
}
return err
} }
return err
} }
return nil return nil
} }

4
pkg/kubectl/stop_test.go
View File

@ -70,7 +70,7 @@ func TestReplicationControllerStop(t *testing.T) {
}, },
}, },
StopError: nil, StopError: nil,
ExpectedActions: []string{"get", "list", "get", "update", "watch", "delete"}, ExpectedActions: []string{"get", "list", "get", "update", "get", "delete"},
}, },
{ {
Name: "NoOverlapping", Name: "NoOverlapping",
@ -108,7 +108,7 @@ func TestReplicationControllerStop(t *testing.T) {
}, },
}, },
StopError: nil, StopError: nil,
ExpectedActions: []string{"get", "list", "get", "update", "watch", "delete"}, ExpectedActions: []string{"get", "list", "get", "update", "get", "delete"},
}, },
{ {
Name: "OverlappingError", Name: "OverlappingError",