Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

etcd healthz, hotloop fixes #19992

Merged
merged 4 commits into from
Jun 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ import:
version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
# master: etcd
- package: github.com/coreos/etcd
version: v3.2.16
repo: https://github.com/openshift/coreos-etcd.git
version: origin-3.10-etcd-v3.2.16
- package: google.golang.org/grpc
version: v1.7.5
- package: github.com/grpc-ecosystem/grpc-gateway
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/origin/webconsole_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func withAssetServerRedirect(handler http.Handler, accessor *webConsolePublicURL
func (c *MasterConfig) withConsoleRedirection(handler, assetServerHandler http.Handler, accessor *webConsolePublicURLAccessor) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
// blacklist well known paths so we do not risk recursion deadlocks
for _, prefix := range []string{"/apis", "/api", "/oapi", "/healtz", "/version"} {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@simo5 awkward. :)

Copy link
Contributor

@simo5 simo5 Jun 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uups, I guess healthz was not the one that caused the loop :-)

for _, prefix := range []string{"/apis", "/api", "/oapi", "/healthz", "/version"} {
if req.URL.Path == prefix || strings.HasPrefix(req.URL.Path, prefix+"/") {
// Dispatch to the next handler
handler.ServeHTTP(w, req)
Expand Down
14 changes: 14 additions & 0 deletions vendor/github.com/coreos/etcd/clientv3/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/coreos/etcd/clientv3/watch.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.