Skip to content

[VC-35738] Allow DataGatherer.Run to return without stopping the other errgroup Go Routines #605

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
wallrj merged 1 commit into from
Nov 7, 2024
Merged

[VC-35738] Allow DataGatherer.Run to return without stopping the other errgroup Go Routines #605

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
7 changes: 5 additions & 2 deletions pkg/agent/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,14 @@ func Run(cmd *cobra.Command, args []string) error {

// start the data gatherers and wait for the cache sync
group.Go(func() error {
// Most implementations of `DataGatherer.Run` return immediately.

@maelvls maelvls Nov 7, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side-note, you don't need to change anything:

I find it weird that the Run func's implementation varies from data gatherers to data gatherers...

The specification of the Run func (an interface, I assume) seems to be defined as "Run blocks until the channel is closed".

But the local datagatherer, for example, is implemented like this:

func (g *DataGatherer) Run(stopCh <-chan struct{}) error {
	// no async functionality, see Fetch
	return nil
}

It should be:

func (g *DataGatherer) Run(stopCh <-chan struct{}) error {
	// no async functionality, see Fetch
	<-stopCh
	return nil
}

// Only the Dynamic DataGatherer starts an informer which runs and
// blocks until the supplied channel is closed.
// For this reason, we must allow these errgroup Go routines to exit
// without cancelling the other Go routines in the group.
if err := newDg.Run(gctx.Done()); err != nil {
return fmt.Errorf("failed to start %q data gatherer %q: %v", kind, dgConfig.Name, err)
}
// The agent must stop if any of the data gatherers stops
cancel()
return nil
})

Expand Down