Skip to content

Fix the bug that WAIT stage does not wait for the specified duration #1226

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
pipecd-bot merged 1 commit into from
Dec 10, 2020
Merged

Fix the bug that WAIT stage does not wait for the specified duration #1226

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
36 changes: 18 additions & 18 deletions pkg/app/piped/executor/wait/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,26 +83,26 @@ func (e *Executor) Execute(sig executor.StopSignal) model.StageStatus {
defer ticker.Stop()

e.LogPersister.Infof("Waiting for %v...", duration)
select {
case <-timer.C:
break

case <-ticker.C:
e.LogPersister.Infof("%v elapsed...", time.Since(startTime))

case s := <-sig.Ch():
switch s {
case executor.StopSignalCancel:
return model.StageStatus_STAGE_CANCELLED
case executor.StopSignalTerminate:
return originalStatus
default:
return model.StageStatus_STAGE_FAILURE
for {
select {
case <-timer.C:
e.LogPersister.Infof("Waited for %v", totalDuration)
return model.StageStatus_STAGE_SUCCESS

case <-ticker.C:
e.LogPersister.Infof("%v elapsed...", time.Since(startTime))

case s := <-sig.Ch():
switch s {
case executor.StopSignalCancel:
return model.StageStatus_STAGE_CANCELLED
case executor.StopSignalTerminate:
return originalStatus
default:
return model.StageStatus_STAGE_FAILURE
}
Copy link
Member

@nghialv nghialv Dec 10, 2020

Choose a reason for hiding this comment

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

nit: Could you please change to use a return instead of the break at line 90.

for {
   select {
   case <- timer.C:
      	e.LogPersister.Infof("Waited for %v", totalDuration)
	return model.StageStatus_STAGE_SUCCESS
   
   case <-ticker.C:
        e.LogPersister.Infof("%v elapsed...", time.Since(startTime))

   case s := <-sig.Ch():
        ....
   }
}
}

Copy link
Contributor Author

@ShotaKitazawa ShotaKitazawa Dec 10, 2020

Choose a reason for hiding this comment

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

thanks, I fixed it in git commit --amend

}
}

e.LogPersister.Infof("Waited for %v", totalDuration)
return model.StageStatus_STAGE_SUCCESS
}

func (e *Executor) retrieveStartTime() (t time.Time) {
Expand Down