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

fix: Fix the issue of relist caused by client-side timeout

Browse Source 
Signed-off-by: likakuli <1154584512@qq.com>
This commit is contained in:
likakuli 2025-01-24 11:44:32 +08:00
parent 5aeea45357
commit 38a21e06f5
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apimachinery/pkg/util/framer/framer.go
View File

@ -91,12 +91,12 @@ func (r *lengthDelimitedFrameReader) Read(data []byte) (int, error) {
} }
n, err := io.ReadAtLeast(r.r, data[:max], int(max)) n, err := io.ReadAtLeast(r.r, data[:max], int(max))
r.remaining -= n r.remaining -= n
if err == io.ErrShortBuffer || r.remaining > 0 {
return n, io.ErrShortBuffer
}
if err != nil { if err != nil {
return n, err return n, err
} }
if r.remaining > 0 {
return n, io.ErrShortBuffer
}
if n != expect { if n != expect {
return n, io.ErrUnexpectedEOF return n, io.ErrUnexpectedEOF
} }

46
staging/src/k8s.io/apimachinery/pkg/util/framer/framer_test.go
View File

@ -20,7 +20,12 @@ import (
"bytes" "bytes"
"errors" "errors"
"io" "io"
"net/http"
"net/http/httptest"
"testing" "testing"
"time"
netutil "k8s.io/apimachinery/pkg/util/net"
) )
func TestRead(t *testing.T) { func TestRead(t *testing.T) {
@ -98,6 +103,7 @@ func TestReadLarge(t *testing.T) {
t.Fatalf("unexpected: %v %d", err, n) t.Fatalf("unexpected: %v %d", err, n)
} }
} }
func TestReadInvalidFrame(t *testing.T) { func TestReadInvalidFrame(t *testing.T) {
data := []byte{ data := []byte{
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04,
@ -120,6 +126,46 @@ func TestReadInvalidFrame(t *testing.T) {
} }
} }
func TestReadClientTimeout(t *testing.T) {
header := []byte{
0x00, 0x00, 0x00, 0x04,
}
data := []byte{
0x01, 0x02, 0x03, 0x04,
0x00, 0x00, 0x00, 0x03,
0x05, 0x06, 0x07,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01,
0x08,
}
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
_, _ = w.Write(header)
if flusher, ok := w.(http.Flusher); ok {
flusher.Flush()
}
time.Sleep(1 * time.Second)
_, _ = w.Write(data)
}))
defer server.Close()
client := &http.Client{
Timeout: 500 * time.Millisecond,
}
resp, err := client.Get(server.URL)
if err != nil {
t.Fatalf("unexpected: %v", err)
}
r := NewLengthDelimitedFrameReader(resp.Body)
buf := make([]byte, 1)
if n, err := r.Read(buf); err == nil || !netutil.IsTimeout(err) {
t.Fatalf("unexpected: %v %d", err, n)
}
}
func TestJSONFrameReader(t *testing.T) { func TestJSONFrameReader(t *testing.T) {
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]") b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]")
r := NewJSONFramedReader(io.NopCloser(b)) r := NewJSONFramedReader(io.NopCloser(b))