gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(rpc): return 598 http status code if fail to decode from response

Browse Source 
. #22420678

Signed-off-by: slasher <shenjie1@oppo.com>
This commit is contained in:
slasher 2024-07-19 17:29:25 +08:00 committed by 梁曟風
parent 9d392be776
commit 4aca6e2127
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
blobstore/common/rpc/client.go
View File

@ -30,6 +30,8 @@ import (
"github.com/cubefs/cubefs/blobstore/util/errors"
)
const decodeStatus = 598
// Config simple client config
type Config struct {
// the whole request and response timeout
@ -305,7 +307,7 @@ func parseData(resp *http.Response, data interface{}) (err error) {
// ParseData parse response with data, close response body by yourself.
func ParseData(resp *http.Response, data interface{}) (err error) {
if resp.StatusCode/100 == 2 {
if code := resp.StatusCode; code/100 == 2 {
size := resp.ContentLength
if data != nil && size != 0 {
if d, ok := data.(UnmarshalerFrom); ok {
@ -316,19 +318,21 @@ func ParseData(resp *http.Response, data interface{}) (err error) {
buf := bytespool.Alloc(int(size))
defer bytespool.Free(buf)
if _, err = io.ReadFull(resp.Body, buf); err != nil {
return NewError(resp.StatusCode, "ReadResponse", err)
return NewError(decodeStatus, "ReadResponse",
fmt.Errorf("%d response read %s", code, err.Error()))
}
return d.Unmarshal(buf)
}
if err := json.NewDecoder(resp.Body).Decode(data); err != nil {
return NewError(resp.StatusCode, "JSONDecode", err)
if err = json.NewDecoder(resp.Body).Decode(data); err != nil {
return NewError(decodeStatus, "JSONDecode",
fmt.Errorf("%d response decode %s", code, err.Error()))
}
}
if resp.StatusCode == 200 {
if code == 200 {
return nil
}
return NewError(resp.StatusCode, "", err)
return NewError(code, "NotStatusOK", fmt.Errorf("%d response", code))
}
return ParseResponseErr(resp)
}
@ -339,12 +343,13 @@ func ParseResponseErr(resp *http.Response) (err error) {
if resp.StatusCode > 299 && resp.ContentLength != 0 {
errR := &errorResponse{}
if err := json.NewDecoder(resp.Body).Decode(errR); err != nil {
return NewError(resp.StatusCode, resp.Status, nil)
return NewError(decodeStatus, "JSONDecode",
fmt.Errorf("%d response decode %s", resp.StatusCode, err.Error()))
}
err = NewError(resp.StatusCode, errR.Code, errors.New(errR.Error))
return
}
return NewError(resp.StatusCode, resp.Status, nil)
return NewError(resp.StatusCode, resp.Status, fmt.Errorf("%d response", resp.StatusCode))
}
type timeoutReadCloser struct {

2
blobstore/common/rpc/context.go
View File

@ -170,7 +170,7 @@ func (c *Context) RespondStatusData(statusCode int, obj interface{}) {
c.RespondError(err)
return
}
c.RespondWithReader(statusCode, body.ContentLength, body.ContentType, body.Body, nil)
c.RespondWith(statusCode, body.ContentType, body.Bytes)
}
// RespondWith response with code, content-type, bytes

3
blobstore/common/rpc/proto.go
View File

@ -149,6 +149,7 @@ type marshalledBody struct {
ContentLength int
ContentType string
Body io.Reader
Bytes []byte
}
func marshalObj(obj interface{}) (*marshalledBody, error) {
@ -169,6 +170,7 @@ func marshalObj(obj interface{}) (*marshalledBody, error) {
ContentLength: w.Len(),
ContentType: ct,
Body: w,
Bytes: w.Bytes(),
}, nil
} else if o, ok := obj.(Marshaler); ok {
@ -183,6 +185,7 @@ func marshalObj(obj interface{}) (*marshalledBody, error) {
ContentLength: len(buffer),
ContentType: ct,
Body: bytes.NewReader(buffer),
Bytes: buffer[:],
}, nil
}