Fix race issue #22
Closed
Fix race issue #22
Conversation
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 reverts commit b70cdfa.
|
@alixander, it's ready for merge, and we can test it afterward. |
yea i did... |
|
@alixander can we test now ? or is there a problem... |
alixander
requested changes
Oct 3, 2024
xhttp/serve.go
Outdated
| @@ -41,11 +81,12 @@ func Serve(ctx context.Context, shutdownTimeout time.Duration, s *http.Server, l | |||
| shutdownCtx, cancel := context.WithTimeout(xcontext.WithoutCancel(ctx), shutdownTimeout) | |||
| defer cancel() | |||
|
|
|||
| err := s.Shutdown(shutdownCtx) | |||
| err := ss.Shutdown(shutdownCtx) | |||
| <-serverClosed // Wait for server to exit | |||
There was a problem hiding this comment.
the previous changes were not reverted
There was a problem hiding this comment.
@alixander can you just do a reset on the master branch ?
tho i really don't understand why a revert is necessary here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fix: Resolve race condition in HTTP server handling
safeServerto wrap http.ServersafeServerfor improved concurrencyThis change addresses a race condition in the HTTP server handling,particularly affecting CLI tests. By introducing a
safeServerstruct with atomic operations and proper synchronization, and prevent potential data races during server startup and shutdown.Fix for terrastruct/d2#2087