Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etchttp: return 410 gone for permanently removed members

Browse Source
This commit is contained in:
Jonathan Boulle 2014-11-04 11:21:24 -08:00
parent ac49e1d50f
commit cedcc0d8df
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/etcdhttp/client.go
View File

@ -211,6 +211,8 @@ func (h *membersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
err = h.server.RemoveMember(ctx, uint64(id)) err = h.server.RemoveMember(ctx, uint64(id))
switch { switch {
case err == etcdserver.ErrIDRemoved:
writeError(w, httptypes.NewHTTPError(http.StatusGone, fmt.Sprintf("Member permanently removed: %s", idStr)))
case err == etcdserver.ErrIDNotFound: case err == etcdserver.ErrIDNotFound:
writeError(w, httptypes.NewHTTPError(http.StatusNotFound, fmt.Sprintf("No such member: %s", idStr))) writeError(w, httptypes.NewHTTPError(http.StatusNotFound, fmt.Sprintf("No such member: %s", idStr)))
case err != nil: case err != nil:

12
etcdserver/etcdhttp/client_test.go
View File

@ -785,6 +785,18 @@ func TestServeMembersFail(t *testing.T) {
http.StatusInternalServerError, http.StatusInternalServerError,
}, },
{
// etcdserver.RemoveMember error with preivously removed ID
&http.Request{
URL: mustNewURL(t, path.Join(membersPrefix, "0")),
Method: "DELETE",
},
&errServer{
etcdserver.ErrIDRemoved,
},
http.StatusGone,
},
{ {
// etcdserver.RemoveMember error with nonexistent ID // etcdserver.RemoveMember error with nonexistent ID
&http.Request{ &http.Request{