forked from etcd-io/etcd
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
*: move v2http handlers without /v2 prefix to etcdhttp
Lets --enable-v2=false configurations provide /metrics, /health, etc. Fixes etcd-io#8167
- Loading branch information
Anthony Romano
committed
Jul 8, 2017
1 parent
97f37e4
commit e29db92
Showing
10 changed files
with
308 additions
and
192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| // Copyright 2015 The etcd Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package etcdhttp | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "expvar" | ||
| "fmt" | ||
| "net/http" | ||
| "strings" | ||
| "time" | ||
|
|
||
| etcdErr "github.com/coreos/etcd/error" | ||
| "github.com/coreos/etcd/etcdserver" | ||
| "github.com/coreos/etcd/etcdserver/api" | ||
| "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" | ||
| "github.com/coreos/etcd/etcdserver/etcdserverpb" | ||
| "github.com/coreos/etcd/pkg/logutil" | ||
| "github.com/coreos/etcd/raft" | ||
| "github.com/coreos/etcd/version" | ||
| "github.com/coreos/pkg/capnslog" | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "golang.org/x/net/context" | ||
| ) | ||
|
|
||
| var ( | ||
| plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api/etcdhttp") | ||
| mlog = logutil.NewMergeLogger(plog) | ||
| ) | ||
|
|
||
| const ( | ||
| configPath = "/config" | ||
| metricsPath = "/metrics" | ||
| healthPath = "/health" | ||
| varsPath = "/debug/vars" | ||
| versionPath = "/version" | ||
| ) | ||
|
|
||
| // HandleBasic adds handlers to a mux for serving JSON etcd client requests | ||
| // that do not access the v2 store. | ||
| func HandleBasic(mux *http.ServeMux, server *etcdserver.EtcdServer) { | ||
| mux.HandleFunc(varsPath, serveVars) | ||
| mux.HandleFunc(configPath+"/local/log", logHandleFunc) | ||
| mux.Handle(metricsPath, prometheus.Handler()) | ||
| mux.Handle(healthPath, healthHandler(server)) | ||
| mux.HandleFunc(versionPath, versionHandler(server.Cluster(), serveVersion)) | ||
| } | ||
|
|
||
| func healthHandler(server *etcdserver.EtcdServer) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| if !allowMethod(w, r, "GET") { | ||
| return | ||
| } | ||
| if uint64(server.Leader()) == raft.None { | ||
| http.Error(w, `{"health": "false"}`, http.StatusServiceUnavailable) | ||
| return | ||
| } | ||
| ctx, cancel := context.WithTimeout(context.Background(), time.Second) | ||
| defer cancel() | ||
| if _, err := server.Do(ctx, etcdserverpb.Request{Method: "QGET"}); err != nil { | ||
| http.Error(w, `{"health": "false"}`, http.StatusServiceUnavailable) | ||
| return | ||
| } | ||
| w.WriteHeader(http.StatusOK) | ||
| w.Write([]byte(`{"health": "true"}`)) | ||
| } | ||
| } | ||
|
|
||
| func versionHandler(c api.Cluster, fn func(http.ResponseWriter, *http.Request, string)) http.HandlerFunc { | ||
| return func(w http.ResponseWriter, r *http.Request) { | ||
| v := c.Version() | ||
| if v != nil { | ||
| fn(w, r, v.String()) | ||
| } else { | ||
| fn(w, r, "not_decided") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func serveVersion(w http.ResponseWriter, r *http.Request, clusterV string) { | ||
| if !allowMethod(w, r, "GET") { | ||
| return | ||
| } | ||
| vs := version.Versions{ | ||
| Server: version.Version, | ||
| Cluster: clusterV, | ||
| } | ||
|
|
||
| w.Header().Set("Content-Type", "application/json") | ||
| b, err := json.Marshal(&vs) | ||
| if err != nil { | ||
| plog.Panicf("cannot marshal versions to json (%v)", err) | ||
| } | ||
| w.Write(b) | ||
| } | ||
|
|
||
| func logHandleFunc(w http.ResponseWriter, r *http.Request) { | ||
| if !allowMethod(w, r, "PUT") { | ||
| return | ||
| } | ||
|
|
||
| in := struct{ Level string }{} | ||
|
|
||
| d := json.NewDecoder(r.Body) | ||
| if err := d.Decode(&in); err != nil { | ||
| WriteError(w, r, httptypes.NewHTTPError(http.StatusBadRequest, "Invalid json body")) | ||
| return | ||
| } | ||
|
|
||
| logl, err := capnslog.ParseLevel(strings.ToUpper(in.Level)) | ||
| if err != nil { | ||
| WriteError(w, r, httptypes.NewHTTPError(http.StatusBadRequest, "Invalid log level "+in.Level)) | ||
| return | ||
| } | ||
|
|
||
| plog.Noticef("globalLogLevel set to %q", logl.String()) | ||
| capnslog.SetGlobalLogLevel(logl) | ||
| w.WriteHeader(http.StatusNoContent) | ||
| } | ||
|
|
||
| func serveVars(w http.ResponseWriter, r *http.Request) { | ||
| if !allowMethod(w, r, "GET") { | ||
| return | ||
| } | ||
|
|
||
| w.Header().Set("Content-Type", "application/json; charset=utf-8") | ||
| fmt.Fprintf(w, "{\n") | ||
| first := true | ||
| expvar.Do(func(kv expvar.KeyValue) { | ||
| if !first { | ||
| fmt.Fprintf(w, ",\n") | ||
| } | ||
| first = false | ||
| fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value) | ||
| }) | ||
| fmt.Fprintf(w, "\n}\n") | ||
| } | ||
|
|
||
| func allowMethod(w http.ResponseWriter, r *http.Request, m string) bool { | ||
| if m == r.Method { | ||
| return true | ||
| } | ||
| w.Header().Set("Allow", m) | ||
| http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed) | ||
| return false | ||
| } | ||
|
|
||
| // WriteError logs and writes the given Error to the ResponseWriter | ||
| // If Error is an etcdErr, it is rendered to the ResponseWriter | ||
| // Otherwise, it is assumed to be a StatusInternalServerError | ||
| func WriteError(w http.ResponseWriter, r *http.Request, err error) { | ||
| if err == nil { | ||
| return | ||
| } | ||
| switch e := err.(type) { | ||
| case *etcdErr.Error: | ||
| e.WriteTo(w) | ||
| case *httptypes.HTTPError: | ||
| if et := e.WriteTo(w); et != nil { | ||
| plog.Debugf("error writing HTTPError (%v) to %s", et, r.RemoteAddr) | ||
| } | ||
| default: | ||
| switch err { | ||
| case etcdserver.ErrTimeoutDueToLeaderFail, etcdserver.ErrTimeoutDueToConnectionLost, etcdserver.ErrNotEnoughStartedMembers, etcdserver.ErrUnhealthy: | ||
| mlog.MergeError(err) | ||
| default: | ||
| mlog.MergeErrorf("got unexpected response error (%v)", err) | ||
| } | ||
| herr := httptypes.NewHTTPError(http.StatusInternalServerError, "Internal Server Error") | ||
| if et := herr.WriteTo(w); et != nil { | ||
| plog.Debugf("error writing HTTPError (%v) to %s", et, r.RemoteAddr) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Copyright 2017 The etcd Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package etcdhttp | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "testing" | ||
|
|
||
| "github.com/coreos/etcd/version" | ||
| ) | ||
|
|
||
| func TestServeVersion(t *testing.T) { | ||
| req, err := http.NewRequest("GET", "", nil) | ||
| if err != nil { | ||
| t.Fatalf("error creating request: %v", err) | ||
| } | ||
| rw := httptest.NewRecorder() | ||
| serveVersion(rw, req, "2.1.0") | ||
| if rw.Code != http.StatusOK { | ||
| t.Errorf("code=%d, want %d", rw.Code, http.StatusOK) | ||
| } | ||
| vs := version.Versions{ | ||
| Server: version.Version, | ||
| Cluster: "2.1.0", | ||
| } | ||
| w, err := json.Marshal(&vs) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if g := rw.Body.String(); g != string(w) { | ||
| t.Fatalf("body = %q, want %q", g, string(w)) | ||
| } | ||
| if ct := rw.HeaderMap.Get("Content-Type"); ct != "application/json" { | ||
| t.Errorf("contet-type header = %s, want %s", ct, "application/json") | ||
| } | ||
| } | ||
|
|
||
| func TestServeVersionFails(t *testing.T) { | ||
| for _, m := range []string{ | ||
| "CONNECT", "TRACE", "PUT", "POST", "HEAD", | ||
| } { | ||
| req, err := http.NewRequest(m, "", nil) | ||
| if err != nil { | ||
| t.Fatalf("error creating request: %v", err) | ||
| } | ||
| rw := httptest.NewRecorder() | ||
| serveVersion(rw, req, "2.1.0") | ||
| if rw.Code != http.StatusMethodNotAllowed { | ||
| t.Errorf("method %s: code=%d, want %d", m, rw.Code, http.StatusMethodNotAllowed) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.