Skip to content

Generators: Drop out of the ring before stopping ingestion #4101

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

Merged
joe-elliott merged 3 commits into from
Sep 20, 2024
Merged

Generators: Drop out of the ring before stopping ingestion #4101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c7f827
shutdown generators only after they have been removed from the ring
joe-elliott Sep 19, 2024
97007a5
wait for a little bit
joe-elliott Sep 19, 2024
619997b
changelog
joe-elliott Sep 20, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* [ENHANCEMENT] Add disk caching in ingester SearchTagValuesV2 for completed blocks [#4069](https://github.com/grafana/tempo/pull/4069) (@electron0zero)
* [BUGFIX] Replace hedged requests roundtrips total with a counter. [#4063](https://github.com/grafana/tempo/pull/4063) [#4078](https://github.com/grafana/tempo/pull/4078) (@galalen)
* [BUGFIX] Metrics generators: Correctly drop from the ring before stopping ingestion to reduce drops during a rollout. [#4101](https://github.com/grafana/tempo/pull/4101) (@joe-elliott)
* [CHANGE] TraceByID: don't allow concurrent_shards greater than query_shards. [#4074](https://github.com/grafana/tempo/pull/4074) (@electron0zero)
* **BREAKING CHANGE** tempo-query is no longer a jaeger instance with grpcPlugin. Its now a standalone server. Serving a grpc api for jaeger on `0.0.0.0:7777` by default. [#3840](https://github.com/grafana/tempo/issues/3840) (@frzifus)
* [CHANGE] **BREAKING CHANGE** The dynamic injection of X-Scope-OrgID header for metrics generator remote-writes is changed. If the header is aleady set in per-tenant overrides or global tempo configuration, then it is honored and not overwritten. [#4021](https://github.com/grafana/tempo/pull/4021) (@mdisibio)
Expand Down
9 changes: 6 additions & 3 deletions modules/generator/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"path"
"sync"
"time"

"github.com/go-kit/log"
"github.com/go-kit/log/level"
Expand Down Expand Up @@ -162,16 +163,18 @@ func (g *Generator) running(ctx context.Context) error {
}

func (g *Generator) stopping(_ error) error {
// Mark as read-only
g.stopIncomingRequests()

if g.subservices != nil {
err := services.StopManagerAndAwaitStopped(context.Background(), g.subservices)
if err != nil {
level.Error(g.logger).Log("msg", "failed to stop metrics-generator dependencies", "err", err)
}
}

time.Sleep(5 * time.Second) // let the ring propagate the shutdown

// Mark as read-only after we have removed ourselves from the ring
g.stopIncomingRequests()

var wg sync.WaitGroup
wg.Add(len(g.instances))

Expand Down