github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport of NET-5187: Upgrade test timeout due to log producer errors into release/1.15.x (#18471) 

backport of commit 59bfc81d49

Co-authored-by: NiniOak <anita.akaeze@hashicorp.com>
pull/18480/head
hc-github-team-consul-core 2023-08-15 11:52:23 -05:00 committed by GitHub
parent 3e5ffe5602
commit a12708dc16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/integration/consul-container/libs/service/connect.go
View File

@ -64,14 +64,17 @@ func (g ConnectContainer) GetPort(port int) (int, error) {
} }
func (g ConnectContainer) Restart() error { func (g ConnectContainer) Restart() error {
_, err := g.GetStatus() var deferClean utils.ResettableDefer
if err != nil { defer deferClean.Execute()
return fmt.Errorf("error fetching sidecar container state %s", err)
if utils.FollowLog {
if err := g.container.StopLogProducer(); err != nil {
return fmt.Errorf("stopping log producer: %w", err)
}
} }
fmt.Printf("Stopping container: %s\n", g.GetName()) fmt.Printf("Stopping container: %s\n", g.GetName())
err = g.container.Stop(g.ctx, nil) err := g.container.Stop(g.ctx, nil)
if err != nil { if err != nil {
return fmt.Errorf("error stopping sidecar container %s", err) return fmt.Errorf("error stopping sidecar container %s", err)
} }
@ -81,6 +84,17 @@ func (g ConnectContainer) Restart() error {
if err != nil { if err != nil {
return fmt.Errorf("error starting sidecar container %s", err) return fmt.Errorf("error starting sidecar container %s", err)
} }
if utils.FollowLog {
if err := g.container.StartLogProducer(g.ctx); err != nil {
return fmt.Errorf("starting log producer: %w", err)
}
g.container.FollowOutput(&LogConsumer{})
deferClean.Add(func() {
_ = g.container.StopLogProducer()
})
}
return nil return nil
} }