-
Notifications
You must be signed in to change notification settings - Fork 38.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add StatefulSet update pod unit test and set log level #35665
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| /* | ||
| 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 petset | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/api/testapi" | ||
| "k8s.io/kubernetes/pkg/apimachinery/registered" | ||
| clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" | ||
| "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" | ||
| "k8s.io/kubernetes/pkg/client/restclient" | ||
| "k8s.io/kubernetes/pkg/client/testing/core" | ||
| "k8s.io/kubernetes/pkg/runtime" | ||
| utiltesting "k8s.io/kubernetes/pkg/util/testing" | ||
| ) | ||
|
|
||
| func newPetClient(client *clientset.Clientset) *apiServerPetClient { | ||
| return &apiServerPetClient{ | ||
| c: client, | ||
| } | ||
| } | ||
|
|
||
| func makeTwoDifferntPCB() (pcb1, pcb2 *pcb) { | ||
| userAdded := api.Volume{ | ||
| Name: "test", | ||
| VolumeSource: api.VolumeSource{ | ||
| EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageMediumMemory}, | ||
| }, | ||
| } | ||
| ps := newStatefulSet(2) | ||
| pcb1, _ = newPCB("1", ps) | ||
| pcb2, _ = newPCB("2", ps) | ||
| pcb2.pod.Spec.Volumes = append(pcb2.pod.Spec.Volumes, userAdded) | ||
| return pcb1, pcb2 | ||
| } | ||
|
|
||
| func TestUpdatePetWithoutRetry(t *testing.T) { | ||
| pcb1, pcb2 := makeTwoDifferntPCB() | ||
| // invalid pet with empty pod | ||
| invalidPcb := *pcb1 | ||
| invalidPcb.pod = nil | ||
|
|
||
| testCases := []struct { | ||
| realPet *pcb | ||
| expectedPet *pcb | ||
| expectErr bool | ||
| requests int | ||
| }{ | ||
| // case 0: error occurs, no need to update | ||
| { | ||
| realPet: pcb1, | ||
| expectedPet: &invalidPcb, | ||
| expectErr: true, | ||
| requests: 0, | ||
| }, | ||
| // case 1: identical pet, no need to update | ||
| { | ||
| realPet: pcb1, | ||
| expectedPet: pcb1, | ||
| expectErr: false, | ||
| requests: 0, | ||
| }, | ||
| // case 2: need to call update once | ||
| { | ||
| realPet: pcb1, | ||
| expectedPet: pcb2, | ||
| expectErr: false, | ||
| requests: 1, | ||
| }, | ||
| } | ||
|
|
||
| for k, tc := range testCases { | ||
| body := runtime.EncodeOrDie(testapi.Default.Codec(), &api.Pod{ObjectMeta: api.ObjectMeta{Name: "empty_pod"}}) | ||
| fakeHandler := utiltesting.FakeHandler{ | ||
| StatusCode: 200, | ||
| ResponseBody: string(body), | ||
| } | ||
| testServer := httptest.NewServer(&fakeHandler) | ||
|
|
||
| client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) | ||
| petClient := newPetClient(client) | ||
| err := petClient.Update(tc.realPet, tc.expectedPet) | ||
|
|
||
| if tc.expectErr != (err != nil) { | ||
| t.Errorf("case %d: expect error(%v), got err: %v", k, tc.expectErr, err) | ||
| } | ||
| fakeHandler.ValidateRequestCount(t, tc.requests) | ||
| testServer.Close() | ||
| } | ||
| } | ||
|
|
||
| func TestUpdatePetWithFailure(t *testing.T) { | ||
| fakeHandler := utiltesting.FakeHandler{ | ||
| StatusCode: 500, | ||
| ResponseBody: "{}", | ||
| } | ||
| testServer := httptest.NewServer(&fakeHandler) | ||
| defer testServer.Close() | ||
|
|
||
| client := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: ®istered.GroupOrDie(api.GroupName).GroupVersion}}) | ||
| petClient := newPetClient(client) | ||
|
|
||
| pcb1, pcb2 := makeTwoDifferntPCB() | ||
|
|
||
| if err := petClient.Update(pcb1, pcb2); err == nil { | ||
| t.Errorf("expect error, got nil") | ||
| } | ||
| // 1 Update and 1 GET, both of which fail | ||
| fakeHandler.ValidateRequestCount(t, 2) | ||
| } | ||
|
|
||
| func TestUpdatePetRetrySucceed(t *testing.T) { | ||
| pcb1, pcb2 := makeTwoDifferntPCB() | ||
|
|
||
| fakeClient := &fake.Clientset{} | ||
| fakeClient.AddReactor("get", "pods", func(action core.Action) (bool, runtime.Object, error) { | ||
| return true, pcb2.pod, nil | ||
| }) | ||
| fakeClient.AddReactor("*", "*", func(action core.Action) (bool, runtime.Object, error) { | ||
| return true, nil, fmt.Errorf("Fake error") | ||
| }) | ||
| petClient := apiServerPetClient{ | ||
| c: fakeClient, | ||
| } | ||
|
|
||
| if err := petClient.Update(pcb1, pcb2); err != nil { | ||
| t.Errorf("unexpected error: %v", err) | ||
| } | ||
|
|
||
| actions := fakeClient.Actions() | ||
| if len(actions) != 2 { | ||
| t.Errorf("Expect 2 actions, got %d actions", len(actions)) | ||
| } | ||
| for i := 0; i < len(actions); i++ { | ||
| a := actions[i] | ||
| if a.GetResource().Resource != "pods" { | ||
| t.Errorf("Unexpected action %+v", a) | ||
| continue | ||
| } | ||
|
|
||
| switch action := a.(type) { | ||
| case core.GetAction: | ||
| if i%2 == 0 { | ||
| t.Errorf("Unexpected Get action") | ||
| } | ||
| // Make sure the get is for the right pod | ||
| if action.GetName() != pcb2.pod.Name { | ||
| t.Errorf("Expected get pod %v, got %q instead", pcb2.pod.Name, action.GetName()) | ||
| } | ||
| case core.UpdateAction: | ||
| if i%2 == 1 { | ||
| t.Errorf("Unexpected Update action") | ||
| } | ||
| default: | ||
| t.Errorf("Unexpected action %+v", a) | ||
| break | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also check
fakeHandler.ValidateRequestCount(t, n)here, n be the number of expected callsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good advice but there is a limitation in
FakeHandlerthat we can call ValidateRequestCount only one time for everyFakeHandlerinstance, otherwise will cause panic. So, it's not easy toValidateRequestCountfor every case. Do you have any good ideas?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what if we move the whole fakehandler part into the for loop so that each
ValidateRequestCountuses different fakehandler instance?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, will do.