etcdhttp:write etcderror for all errors in keyhandler
parent
52c5203370
commit
ac67aa9f63
|
@ -127,7 +127,7 @@ func (h *keysHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
rr, err := parseKeyRequest(r, clockwork.NewRealClock())
|
||||
if err != nil {
|
||||
writeError(w, err)
|
||||
writeKeyError(w, err)
|
||||
return
|
||||
}
|
||||
// The path must be valid at this point (we've parsed the request successfully).
|
||||
|
@ -139,7 +139,7 @@ func (h *keysHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
resp, err := h.server.Do(ctx, rr)
|
||||
if err != nil {
|
||||
err = trimErrorPrefix(err, etcdserver.StoreKeysPrefix)
|
||||
writeError(w, err)
|
||||
writeKeyError(w, err)
|
||||
return
|
||||
}
|
||||
switch {
|
||||
|
@ -153,7 +153,7 @@ func (h *keysHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
defer cancel()
|
||||
handleKeyWatch(ctx, w, resp.Watcher, rr.Stream, h.timer)
|
||||
default:
|
||||
writeError(w, errors.New("received response with no Event/Watcher!"))
|
||||
writeKeyError(w, errors.New("received response with no Event/Watcher!"))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -554,6 +554,26 @@ func writeKeyNoAuth(w http.ResponseWriter) {
|
|||
e.WriteTo(w)
|
||||
}
|
||||
|
||||
// writeKeyError logs and writes the given Error to the ResponseWriter.
|
||||
// If Error is not an etcdErr, the error will be converted to an etcd error.
|
||||
func writeKeyError(w http.ResponseWriter, err error) {
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
switch e := err.(type) {
|
||||
case *etcdErr.Error:
|
||||
e.WriteTo(w)
|
||||
default:
|
||||
if err == etcdserver.ErrTimeoutDueToLeaderFail {
|
||||
plog.Error(err)
|
||||
} else {
|
||||
plog.Errorf("got unexpected response error (%v)", err)
|
||||
}
|
||||
ee := etcdErr.NewError(etcdErr.EcodeRaftInternal, err.Error(), 0)
|
||||
ee.WriteTo(w)
|
||||
}
|
||||
}
|
||||
|
||||
func handleKeyWatch(ctx context.Context, w http.ResponseWriter, wa store.Watcher, stream bool, rt etcdserver.RaftTimer) {
|
||||
defer wa.Remove()
|
||||
ech := wa.EventChan()
|
||||
|
|
|
@ -1406,7 +1406,7 @@ func TestBadServeKeys(t *testing.T) {
|
|||
},
|
||||
|
||||
http.StatusInternalServerError,
|
||||
`{"message":"Internal Server Error"}`,
|
||||
`{"errorCode":300,"message":"Raft Internal Error","cause":"Internal Server Error","index":0}`,
|
||||
},
|
||||
{
|
||||
// etcdserver.Server etcd error
|
||||
|
@ -1426,7 +1426,7 @@ func TestBadServeKeys(t *testing.T) {
|
|||
},
|
||||
|
||||
http.StatusInternalServerError,
|
||||
`{"message":"Internal Server Error"}`,
|
||||
`{"errorCode":300,"message":"Raft Internal Error","cause":"received response with no Event/Watcher!","index":0}`,
|
||||
},
|
||||
}
|
||||
for i, tt := range testBadCases {
|
||||
|
|
Loading…
Reference in New Issue