From 0e178f9341405d974bc493c75a4188b83f2ba189 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Fri, 14 Feb 2020 13:48:41 -0600 Subject: [PATCH] rename to sharedLimitWriter --- pkg/kubelet/dockershim/docker_legacy_service.go | 4 ++-- pkg/kubelet/dockershim/helpers.go | 2 +- pkg/kubelet/dockershim/helpers_test.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_legacy_service.go b/pkg/kubelet/dockershim/docker_legacy_service.go index 352f110e300..5026722303d 100644 --- a/pkg/kubelet/dockershim/docker_legacy_service.go +++ b/pkg/kubelet/dockershim/docker_legacy_service.go @@ -81,8 +81,8 @@ func (d *dockerService) GetContainerLogs(_ context.Context, pod *v1.Pod, contain if logOptions.LimitBytes != nil { // stdout and stderr share the total write limit max := *logOptions.LimitBytes - stderr = limitedWriter(stderr, &max) - stdout = limitedWriter(stdout, &max) + stderr = sharedLimitWriter(stderr, &max) + stdout = sharedLimitWriter(stdout, &max) } sopts := libdocker.StreamOptions{ OutputStream: stdout, diff --git a/pkg/kubelet/dockershim/helpers.go b/pkg/kubelet/dockershim/helpers.go index 82da392f60c..9883d901261 100644 --- a/pkg/kubelet/dockershim/helpers.go +++ b/pkg/kubelet/dockershim/helpers.go @@ -426,7 +426,7 @@ func (w sharedWriteLimiter) Write(p []byte) (int, error) { return n, err } -func limitedWriter(w io.Writer, limit *int64) io.Writer { +func sharedLimitWriter(w io.Writer, limit *int64) io.Writer { if w == nil { return nil } diff --git a/pkg/kubelet/dockershim/helpers_test.go b/pkg/kubelet/dockershim/helpers_test.go index ba9b972d0ee..2597af61e4a 100644 --- a/pkg/kubelet/dockershim/helpers_test.go +++ b/pkg/kubelet/dockershim/helpers_test.go @@ -389,7 +389,7 @@ func TestLimitedWriter(t *testing.T) { } { t.Run(name, func(t *testing.T) { limit := tc.limit - w := limitedWriter(&tc.w, &limit) + w := sharedLimitWriter(&tc.w, &limit) n, err := w.Write([]byte(tc.toWrite)) if int64(n) > max(0, tc.limit) { t.Fatalf("bytes written (%d) exceeds limit (%d)", n, tc.limit) @@ -421,8 +421,8 @@ func TestLimitedWriter(t *testing.T) { var ( b1, b2 bytes.Buffer limit = int64(10) - w1 = limitedWriter(&b1, &limit) - w2 = limitedWriter(&b2, &limit) + w1 = sharedLimitWriter(&b1, &limit) + w2 = sharedLimitWriter(&b2, &limit) ch = make(chan struct{}) wg sync.WaitGroup )