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

Jump to bottom

Add recovery middleware to Ingester; re-add recovery middleware to Querier when not running in standalone mode #4349

Merged
merged 3 commits into from
Sep 28, 2021
Merged

Add recovery middleware to Ingester; re-add recovery middleware to Querier when not running in standalone mode #4349

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
d1d202c
Add recovery middleware to ingester; re-add recovery middleware to qu…
JordanRushing Sep 17, 2021
3103a19
Re-add gRPC recovery middleware
JordanRushing Sep 27, 2021
87892c8
Break out gRPC recovery middleware from setupAuthMiddleware() into ne…
JordanRushing Sep 27, 2021
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
7 changes: 7 additions & 0 deletions pkg/loki/loki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import (
"github.com/grafana/loki/pkg/storage/chunk"
"github.com/grafana/loki/pkg/storage/stores/shipper/compactor"
"github.com/grafana/loki/pkg/tracing"
serverutil "github.com/grafana/loki/pkg/util/server"
"github.com/grafana/loki/pkg/validation"
)

Expand Down Expand Up @@ -211,6 +212,7 @@ func New(cfg Config) (*Loki, error) {
}

loki.setupAuthMiddleware()
loki.setupGRPCRecoveryMiddleware()
if err := loki.setupModuleManager(); err != nil {
return nil, err
}
Expand All @@ -235,6 +237,11 @@ func (t *Loki) setupAuthMiddleware() {
})
}

func (t *Loki) setupGRPCRecoveryMiddleware() {
t.Cfg.Server.GRPCMiddleware = append(t.Cfg.Server.GRPCMiddleware, serverutil.RecoveryGRPCUnaryInterceptor)
t.Cfg.Server.GRPCStreamMiddleware = append(t.Cfg.Server.GRPCStreamMiddleware, serverutil.RecoveryGRPCStreamInterceptor)
}

func newDefaultConfig() *Config {
defaultConfig := &Config{}
defaultFS := flag.NewFlagSet("", flag.PanicOnError)
Expand Down
10 changes: 7 additions & 3 deletions pkg/loki/modules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,16 @@ func (t *Loki) initIngester() (_ services.Service, err error) {
if err != nil {
return
}

logproto.RegisterPusherServer(t.Server.GRPC, t.Ingester)
logproto.RegisterQuerierServer(t.Server.GRPC, t.Ingester)
logproto.RegisterIngesterServer(t.Server.GRPC, t.Ingester)
t.Server.HTTP.Path("/flush").Handler(http.HandlerFunc(t.Ingester.FlushHandler))
t.Server.HTTP.Methods("POST").Path("/ingester/flush_shutdown").Handler(http.HandlerFunc(t.Ingester.ShutdownHandler))

httpMiddleware := middleware.Merge(
JordanRushing marked this conversation as resolved.
Show resolved Hide resolved
serverutil.RecoveryHTTPMiddleware,
)
t.Server.HTTP.Path("/flush").Handler(httpMiddleware.Wrap(http.HandlerFunc(t.Ingester.FlushHandler)))
t.Server.HTTP.Methods("POST").Path("/ingester/flush_shutdown").Handler(httpMiddleware.Wrap(http.HandlerFunc(t.Ingester.ShutdownHandler)))

return t.Ingester, nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/querier/worker_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func InitWorkerService(
// HTTP router with middleware to parse the tenant ID from the HTTP header and inject it into the
// request context, as well as make sure any x-www-url-formencoded params are correctly parsed
httpMiddleware := middleware.Merge(
serverutil.RecoveryHTTPMiddleware,
JordanRushing marked this conversation as resolved.
Show resolved Hide resolved
authMiddleware,
serverutil.NewPrepopulateMiddleware(),
)
Expand Down