-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
adding h2c graceful shutdown #4920
Draft
WeidiDeng
wants to merge
5
commits into
caddyserver:master
Choose a base branch
from
WeidiDeng:h2c-graceful
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b285374
adding h2c graceful shutdown
WeidiDeng 5e2f800
fix import loop
WeidiDeng dd769ad
remove unnecessary map and ctxkey, using atomic to count ongoing h2c …
WeidiDeng df54c0c
rebase to latest
WeidiDeng b91ef10
Merge branch 'master' into h2c-graceful
WeidiDeng File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
package caddyhttp | ||
|
||
import ( | ||
"context" | ||
"math/rand" | ||
"net/http" | ||
"net/textproto" | ||
"sync/atomic" | ||
"time" | ||
|
||
"golang.org/x/net/http/httpguts" | ||
) | ||
|
||
// h2chandler is a Handler which counts possible h2c upgrade requests | ||
type h2chandler struct { | ||
cnt uint64 | ||
Handler http.Handler | ||
} | ||
|
||
// NewH2cHandler returns an http.Handler that tracks possible h2c upgrade requests. | ||
func newH2cHandler(h http.Handler) *h2chandler { | ||
return &h2chandler{ | ||
Handler: h, | ||
} | ||
} | ||
|
||
const shutdownPollIntervalMax = 500 * time.Millisecond | ||
|
||
// Shutdown mirrors stdlib http.Server Shutdown behavior, because h2 connections are always marked active, there is no closing to be done. | ||
func (h *h2chandler) Shutdown(ctx context.Context) error { | ||
pollIntervalBase := time.Millisecond | ||
nextPollInterval := func() time.Duration { | ||
// Add 10% jitter. | ||
interval := pollIntervalBase + time.Duration(rand.Intn(int(pollIntervalBase/10))) | ||
// Double and clamp for next time. | ||
pollIntervalBase *= 2 | ||
if pollIntervalBase > shutdownPollIntervalMax { | ||
pollIntervalBase = shutdownPollIntervalMax | ||
} | ||
return interval | ||
} | ||
|
||
timer := time.NewTimer(nextPollInterval()) | ||
defer timer.Stop() | ||
for { | ||
if atomic.LoadUint64(&h.cnt) == 0 { | ||
return nil | ||
} | ||
select { | ||
case <-ctx.Done(): | ||
return ctx.Err() | ||
case <-timer.C: | ||
timer.Reset(nextPollInterval()) | ||
} | ||
} | ||
} | ||
|
||
// isH2cUpgrade check whether request is h2c upgrade request, copied from golang.org/x/net/http2/h2c | ||
func isH2cUpgrade(r *http.Request) bool { | ||
if r.Method == "PRI" && len(r.Header) == 0 && r.URL.Path == "*" && r.Proto == "HTTP/2.0" { | ||
return true | ||
} | ||
|
||
if httpguts.HeaderValuesContainsToken(r.Header[textproto.CanonicalMIMEHeaderKey("Upgrade")], "h2c") && | ||
httpguts.HeaderValuesContainsToken(r.Header[textproto.CanonicalMIMEHeaderKey("Connection")], "HTTP2-Settings") { | ||
return true | ||
} | ||
|
||
return false | ||
} | ||
|
||
// ServeHTTP records underlying connections that are likely to be h2c. | ||
func (h *h2chandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | ||
if isH2cUpgrade(r) { | ||
atomic.AddUint64(&h.cnt, 1) | ||
defer atomic.AddUint64(&h.cnt, ^uint64(0)) | ||
} | ||
h.Handler.ServeHTTP(w, r) | ||
return | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be uppercase, as a separate word?