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

release-2.1: server: deflake TestRapidRestarts #29259

Merged
merged 1 commit into from
Aug 29, 2018

Conversation

petermattis
Copy link
Collaborator

Backport 1/1 commits from #29230.

/cc @cockroachdb/release


In go1.10 and earlier, it was not safe to call http.ServeMux.ServeHTTP
concurrently with http.ServeMux.Handle. (This is fixed in go1.11). In
the interim, provide our own safeServeMux wrapper that provides proper
locking.

Fixes #29227

Release note: None

In go1.10 and earlier, it was not safe to call `http.ServeMux.ServeHTTP`
concurrently with `http.ServeMux.Handle`. (This is fixed in go1.11). In
the interim, provide our own safeServeMux wrapper that provides proper
locking.

Fixes cockroachdb#29227

Release note: None
@petermattis petermattis requested review from benesch and a team August 29, 2018 13:28
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@benesch
Copy link
Contributor

benesch commented Aug 29, 2018

LGTM

@petermattis
Copy link
Collaborator Author

bors r=benesch

craig bot pushed a commit that referenced this pull request Aug 29, 2018
29259: release-2.1: server: deflake TestRapidRestarts r=benesch a=petermattis

Backport 1/1 commits from #29230.

/cc @cockroachdb/release

---

In go1.10 and earlier, it was not safe to call `http.ServeMux.ServeHTTP`
concurrently with `http.ServeMux.Handle`. (This is fixed in go1.11). In
the interim, provide our own safeServeMux wrapper that provides proper
locking.

Fixes #29227

Release note: None


Co-authored-by: Peter Mattis <[email protected]>
@craig
Copy link
Contributor

craig bot commented Aug 29, 2018

Build succeeded

@craig craig bot merged commit bd3a56b into cockroachdb:release-2.1 Aug 29, 2018
@petermattis petermattis deleted the backport2.1-29230 branch August 29, 2018 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants