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

Merge pull request #122850 from neolit123/1.30-v1beta4-timeouts

Browse Source 
kubeadm: use separate context in GetConfigMapWithShortRetry
This commit is contained in:
Kubernetes Prow Robot 2024-01-19 03:28:14 +01:00 committed by GitHub
commit e9756693d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/kubeadm/app/util/apiclient/idempotency.go
View File

@ -19,7 +19,6 @@ package apiclient
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"strings"
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -341,19 +340,16 @@ func GetConfigMapWithShortRetry(client clientset.Interface, namespace, name stri
var lastError error var lastError error
err := wait.PollUntilContextTimeout(context.Background(), err := wait.PollUntilContextTimeout(context.Background(),
time.Millisecond*50, time.Millisecond*350, time.Millisecond*50, time.Millisecond*350,
true, func(ctx context.Context) (bool, error) { true, func(_ context.Context) (bool, error) {
var err error var err error
cm, err = client.CoreV1().ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{}) // Intentionally pass a new context to this API call. This will let the API call run
// independently of the parent context timeout, which is quite short and can cause the API
// call to return abruptly.
cm, err = client.CoreV1().ConfigMaps(namespace).Get(context.Background(), name, metav1.GetOptions{})
if err == nil { if err == nil {
return true, nil return true, nil
} }
// If some code is about to go over the context deadline, "x/time/rate/rate.go" would return lastError = err
// and untyped error with the string "would exceed context deadline". If some code already exceeded
// the deadline the error would be of type DeadlineExceeded. Ignore such context errors and only store
// API and connectivity errors.
if !strings.Contains(err.Error(), "would exceed context deadline") && !errors.Is(err, context.DeadlineExceeded) {
lastError = err
}
return false, nil return false, nil
}) })
if err == nil { if err == nil {

51
cmd/kubeadm/app/util/apiclient/idempotency_test.go
View File

@ -237,54 +237,3 @@ func TestMutateConfigMapWithConflict(t *testing.T) {
t.Fatalf("ConfigMap mutation with conflict was invalid, has: %q", cm.Data["key"]) t.Fatalf("ConfigMap mutation with conflict was invalid, has: %q", cm.Data["key"])
} }
} }
func TestGetConfigMapWithShortRetry(t *testing.T) {
testcases := []struct {
name string
reactorFunc func(core.Action) (bool, runtime.Object, error)
errorCheckFunc func(*testing.T, error)
}{
{
name: "context deadline exceeded error is handled",
reactorFunc: func(core.Action) (bool, runtime.Object, error) {
return true, nil, context.DeadlineExceeded
},
errorCheckFunc: func(t *testing.T, err error) {
if err != nil {
t.Errorf("unexpected error: %v", err)
}
},
},
{
name: "would exceed context deadline error is handled",
reactorFunc: func(core.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("Wait returned an error: rate: Wait(n=1) would exceed context deadline")
},
errorCheckFunc: func(t *testing.T, err error) {
if err != nil {
t.Errorf("unexpected error: %v", err)
}
},
},
{
name: "API error is not handled",
reactorFunc: func(core.Action) (bool, runtime.Object, error) {
return true, nil, apierrors.NewNotFound(schema.GroupResource{}, "")
},
errorCheckFunc: func(t *testing.T, err error) {
if !apierrors.IsNotFound(err) {
t.Errorf("expected error: IsNotFound, got: %v", err)
}
},
},
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
client := fake.NewSimpleClientset()
client.PrependReactor("get", "configmaps", tc.reactorFunc)
_, err := GetConfigMapWithShortRetry(client, "foo", "bar")
tc.errorCheckFunc(t, err)
})
}
}