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.

Sign up for GitHub

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

Remove hardcoded sleep in shutdown for distributor #3687

Merged
merged 2 commits into from
May 21, 2024
Merged

Remove hardcoded sleep in shutdown for distributor #3687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f8b81
remove sleep
chodges15 May 21, 2024
e24eb83
Merge branch 'main' into distShutdown
joe-elliott May 21, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## main / unreleased

* [ENHANCEMENT] Remove hardcoded delay in distributor shutdown [#3687](https://github.com/grafana/tempo/pull/3687) (@chodges15)
* [ENHANCEMENT] Tempo CLI - add percentage support for query blocks #3697 [#3697](https://github.com/grafana/tempo/pull/3697) (@edgarkz)
* [ENHANCEMENT] Update OTLP and add attributes to instrumentation scope in vParquet4 [#3649](https://github.com/grafana/tempo/pull/3649) (@stoewer)
**Breaking Change** The update to OTLP 1.3.0 removes the deprecated `InstrumentationLibrary`
Expand Down
6 changes: 0 additions & 6 deletions modules/distributor/receiver/shim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,6 @@ func (r *receiversShim) starting(ctx context.Context) error {

// Called after distributor is asked to stop via StopAsync.
func (r *receiversShim) stopping(_ error) error {
// when shutdown is called on the receiver it immediately shuts down its connection
// which drops requests on the floor. at this point in the shutdown process
// the readiness handler is already down so we are not receiving any more requests.
// sleep for 30 seconds to here to all pending requests to finish.
time.Sleep(30 * time.Second)

ctx, cancelFn := context.WithTimeout(context.Background(), 30*time.Second)
defer cancelFn()

Expand Down
Loading