change defaultMaxBodySize limit from error to warning (#345)

easegress-io · Nov 2, 2021 · 2d71ba7 · 2d71ba7
1 parent f9b9942
commit 2d71ba7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
  go.etcd.io/etcd/server/v3 v3.5.0
  go.uber.org/zap v1.19.0
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
- golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
+ golang.org/x/sys v0.0.0-20211030160813-b3129d9d1021
  gopkg.in/yaml.v2 v2.4.0
  k8s.io/api v0.21.4
  k8s.io/apimachinery v0.21.4

diff --git a/go.sum b/go.sum
@@ -1608,8 +1608,9 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211030160813-b3129d9d1021 h1:giLT+HuUP/gXYrG2Plg9WTjj4qhfgaW424ZIFog3rlk=
+golang.org/x/sys v0.0.0-20211030160813-b3129d9d1021/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=

diff --git a/pkg/context/httptemplate.go b/pkg/context/httptemplate.go
@@ -180,16 +180,19 @@ func readBody(body io.Reader, maxBodySize int64) (*bytes.Buffer, error) {
  if body == nil {
  return buff, nil
  }
- written, err := io.CopyN(buff, body, defaultMaxBodySize+1)
+
+ written, err := io.Copy(buff, body)
 
  if err != nil && err != io.EOF {
  err = fmt.Errorf("read body failed: %v", err)
  return nil, err
  }
 
- if written > defaultMaxBodySize {
- err = fmt.Errorf("body exceed %dB", defaultMaxBodySize)
- return nil, err
+ if written > maxBodySize {
+ logger.Warnf(
+ "body size was over %dB (was %dB), causing potentially decreased performance",
+ maxBodySize,
+ written)
  }
 
  return buff, nil