Skip to content

Only wait for other modules if underlying service is still running. #2547

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
pstibrany merged 1 commit into from
Apr 30, 2020
Merged

Only wait for other modules if underlying service is still running. #2547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 21 additions & 10 deletions pkg/util/module_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,27 @@ func (w *moduleService) run(serviceContext context.Context) error {
}

func (w *moduleService) stop(_ error) error {
var err error
if w.service.State() == services.Running {
// Only wait for other modules, if underlying service is still running.
w.waitForModulesToStop()

level.Debug(Logger).Log("msg", "stopping", "module", w.name)

err = services.StopAndAwaitTerminated(context.Background(), w.service)
} else {
err = w.service.FailureCase()
}

if err != nil && err != ErrStopProcess {
level.Warn(Logger).Log("msg", "module failed with error", "module", w.name, "err", err)
} else {
level.Info(Logger).Log("msg", "module stopped", "module", w.name)
}
return err
}

func (w *moduleService) waitForModulesToStop() {
// wait until all stopDeps have stopped
stopDeps := w.stopDeps(w.name)
for _, s := range stopDeps {
Expand All @@ -83,14 +104,4 @@ func (w *moduleService) stop(_ error) error {
// fails. But we don't care *how* service stops, as long as it is done.
_ = s.AwaitTerminated(context.Background())
}

level.Debug(Logger).Log("msg", "stopping", "module", w.name)

err := services.StopAndAwaitTerminated(context.Background(), w.service)
if err != nil && err != ErrStopProcess {
level.Warn(Logger).Log("msg", "error stopping module", "module", w.name, "err", err)
} else {
level.Info(Logger).Log("msg", "module stopped", "module", w.name)
}
return err
}