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

[backport 2.0]:fix go pipeline stop hang caused by improper component stop order #1957

Closed
wants to merge 1 commit into from
Closed

[backport 2.0]:fix go pipeline stop hang caused by improper component stop order #1957

Show file tree
Hide file tree
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
13 changes: 5 additions & 8 deletions pluginmanager/config_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"testing"
"time"

"github.com/stretchr/testify/suite"

"github.com/alibaba/ilogtail/pkg/logger"
"github.com/alibaba/ilogtail/plugins/flusher/checker"

"github.com/stretchr/testify/suite"
)

var updateConfigName = "update_mock_block"
Expand Down Expand Up @@ -76,8 +76,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())
s.Equal(20000, GetConfigFlushers(LogtailConfig[noblockUpdateConfigName].PluginRunner)[0].(*checker.FlusherChecker).GetLogCount())
}

Expand All @@ -99,7 +98,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 < 5; i++ {
Expand Down Expand Up @@ -168,7 +167,5 @@ func (s *configUpdateTestSuite) TestHoldOnExitTimeout() {
s.Equal(0, checkFlusher.GetLogCount())
checkFlusher.Block = false
time.Sleep(time.Second * time.Duration(5))
s.Equal(10000, checkFlusher.GetLogCount())
time.Sleep(time.Second * 10)
s.NoError(Resume())
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 @@ -380,6 +380,8 @@ func (p *pluginv1Runner) Stop(exit bool) error {
for _, flusher := range p.FlusherPlugins {
flusher.Flusher.SetUrgent(exit)
}
p.LogstoreConfig.FlushOutFlag = true

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

p.LogstoreConfig.FlushOutFlag = 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 @@ -375,6 +375,8 @@ func (p *pluginv2Runner) Stop(exit bool) error {
for _, flusher := range p.FlusherPlugins {
flusher.SetUrgent(exit)
}
p.LogstoreConfig.FlushOutFlag = true

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

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

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