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

fix go pipeline stop hang caused by improper component stop order #1914

Merged
merged 4 commits into from
Nov 26, 2024
Merged

fix go pipeline stop hang caused by improper component stop order #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a446cb
fix go pipeline stop hang caused by improper component stop order
henryzhx8 Nov 26, 2024
6599307
polish
henryzhx8 Nov 26, 2024
feadb50
Merge branch 'main' into fix/hang
henryzhx8 Nov 26, 2024
bb433a6
polish
henryzhx8 Nov 26, 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
7 changes: 3 additions & 4 deletions pluginmanager/config_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ func (s *configUpdateTestSuite) TestConfigUpdate() {
// unblock old config
checkFlusher.Block = false
time.Sleep(time.Second * time.Duration(5))
s.Equal(10000, checkFlusher.GetLogCount())
// this magic number(10000) must exceed number of logs can be hold in processor channel(LogsChan) + aggregator buffer(defaultLogGroup) + flusher channel(LogGroupsChan)
s.Equal(0, checkFlusher.GetLogCount())
LogtailConfigLock.RLock()
s.Equal(20000, GetConfigFlushers(LogtailConfig[noblockUpdateConfigName].PluginRunner)[0].(*checker.FlusherChecker).GetLogCount())
LogtailConfigLock.RUnlock()
Expand All @@ -104,7 +103,7 @@ func (s *configUpdateTestSuite) TestConfigUpdateMany() {
s.Equal(0, checkFlusher.GetLogCount(), "the hold on block flusher checker doesn't have any logs")
checkFlusher.Block = false
time.Sleep(time.Second * time.Duration(5))
s.Equal(checkFlusher.GetLogCount(), 10000)
s.Equal(checkFlusher.GetLogCount(), 0)

// load normal config
for i := 0; i < 3; i++ {
Expand Down Expand Up @@ -183,5 +182,5 @@ func (s *configUpdateTestSuite) TestStopAllExitTimeout() {
s.Equal(0, checkFlusher.GetLogCount())
checkFlusher.Block = false
time.Sleep(time.Second * time.Duration(5))
s.Equal(10000, checkFlusher.GetLogCount())
s.Equal(0, checkFlusher.GetLogCount())
}
3 changes: 2 additions & 1 deletion pluginmanager/plugin_runner_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,8 @@ func (p *pluginv1Runner) Stop(exit bool) error {
for _, flusher := range p.FlusherPlugins {
flusher.Flusher.SetUrgent(exit)
}
p.LogstoreConfig.FlushOutFlag.Store(true)

for _, service := range p.ServicePlugins {
_ = service.Stop()
}
Expand All @@ -395,7 +397,6 @@ func (p *pluginv1Runner) Stop(exit bool) error {
p.AggregateControl.WaitCancel()
logger.Info(p.LogstoreConfig.Context.GetRuntimeContext(), "aggregator plugins stop", "done")

p.LogstoreConfig.FlushOutFlag.Store(true)
p.FlushControl.WaitCancel()

if exit && p.FlushOutStore.Len() > 0 {
Expand Down
3 changes: 2 additions & 1 deletion pluginmanager/plugin_runner_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ func (p *pluginv2Runner) Stop(exit bool) error {
for _, flusher := range p.FlusherPlugins {
flusher.Flusher.SetUrgent(exit)
}
p.LogstoreConfig.FlushOutFlag.Store(true)

for _, serviceInput := range p.ServicePlugins {
_ = serviceInput.Input.Stop()
}
Expand All @@ -409,7 +411,6 @@ func (p *pluginv2Runner) Stop(exit bool) error {
p.AggregateControl.WaitCancel()
logger.Info(p.LogstoreConfig.Context.GetRuntimeContext(), "aggregator plugins stop", "done")

p.LogstoreConfig.FlushOutFlag.Store(true)
p.FlushControl.WaitCancel()

if exit && p.FlushOutStore.Len() > 0 {
Expand Down
Loading