vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v2_client: read whole response body before close 

Client have to read whole response bodies
if they want the advantage of reusing TCP connections.

https://code.google.com/p/go/source/detail?r=d4e1ec84876c0f5611ab86a03826da14b866efb2&name=release-branch.go1.1&path=/src/pkg/net/http/transport.go
release-2.0
Yicheng Qin 2014-07-15 09:04:04 -07:00
parent 984f309815
commit ee2d5d66af
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
etcd/v2_client.go
View File

@ -72,7 +72,7 @@ func (c *v2client) GetMachines(url string) ([]*machineMessage, *etcdErr.Error) {
}
msgs := new([]*machineMessage)
if uerr := c.parseJSONResponse(resp, msgs); uerr != nil {
if uerr := c.readJSONResponse(resp, msgs); uerr != nil {
return nil, uerr
}
return *msgs, nil
@ -85,7 +85,7 @@ func (c *v2client) GetClusterConfig(url string) (*config.ClusterConfig, *etcdErr
}
config := new(config.ClusterConfig)
if uerr := c.parseJSONResponse(resp, config); uerr != nil {
if uerr := c.readJSONResponse(resp, config); uerr != nil {
return nil, uerr
}
return config, nil
@ -102,20 +102,20 @@ func (c *v2client) AddMachine(url string, name string, info *context) *etcdErr.E
if err != nil {
return clientError(err)
}
defer resp.Body.Close()
if err := c.checkErrorResponse(resp); err != nil {
if err := c.readErrorResponse(resp); err != nil {
return err
}
return nil
}
func (c *v2client) parseJSONResponse(resp *http.Response, val interface{}) *etcdErr.Error {
defer resp.Body.Close()
if err := c.checkErrorResponse(resp); err != nil {
func (c *v2client) readJSONResponse(resp *http.Response, val interface{}) *etcdErr.Error {
if err := c.readErrorResponse(resp); err != nil {
return err
}
defer resp.Body.Close()
defer ioutil.ReadAll(resp.Body)
if err := json.NewDecoder(resp.Body).Decode(val); err != nil {
log.Printf("Error parsing join response: %v", err)
return clientError(err)
@ -123,16 +123,19 @@ func (c *v2client) parseJSONResponse(resp *http.Response, val interface{}) *etcd
return nil
}
func (c *v2client) checkErrorResponse(resp *http.Response) *etcdErr.Error {
if resp.StatusCode != http.StatusOK {
uerr := &etcdErr.Error{}
if err := json.NewDecoder(resp.Body).Decode(uerr); err != nil {
log.Printf("Error parsing response to etcd error: %v", err)
return clientError(err)
}
return uerr
func (c *v2client) readErrorResponse(resp *http.Response) *etcdErr.Error {
if resp.StatusCode == http.StatusOK {
return nil
}
return nil
defer resp.Body.Close()
defer ioutil.ReadAll(resp.Body)
uerr := &etcdErr.Error{}
if err := json.NewDecoder(resp.Body).Decode(uerr); err != nil {
log.Printf("Error parsing response to etcd error: %v", err)
return clientError(err)
}
return uerr
}
// put sends server side PUT request.