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: error handling for trigger release #4488

Merged
merged 5 commits into from
Jan 15, 2024
Merged

fix: error handling for trigger release #4488

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf6f2f2
fixed: error handling for trigger release
Ash-exp Jan 2, 2024
d9b521e
removed: common return statements
Ash-exp Jan 2, 2024
76e37a1
Merge branch 'main' into fix-release-err-handling
Ash-exp Jan 5, 2024
1ade184
Merge branch 'main' into fix-release-err-handling
Ash-exp Jan 9, 2024
130a480
Merge branch 'main' into fix-release-err-handling
Ash-exp Jan 15, 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
34 changes: 20 additions & 14 deletions pkg/pipeline/WorkflowDagExecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ func (impl *WorkflowDagExecutorImpl) processDevtronAsyncHelmInstallRequest(CDAsy
impl.logger.Infow("pipeline triggered successfully !!", "cdPipelineId", overrideRequest.PipelineId, "artifactId", overrideRequest.CiArtifactId, "releaseId", releaseId)
// Update previous deployment runner status (in transaction): Failed
_, span = otel.Tracer("orchestrator").Start(ctx, "updatePreviousDeploymentStatus")
err1 := impl.updatePreviousDeploymentStatus(nil, cdWfr, overrideRequest.PipelineId, CDAsyncInstallNatsMessage.TriggeredAt, overrideRequest.UserId)
err1 := impl.updatePreviousDeploymentStatus(cdWfr, overrideRequest.PipelineId, CDAsyncInstallNatsMessage.TriggeredAt, overrideRequest.UserId)
span.End()
if err1 != nil {
impl.logger.Errorw("error while update previous cd workflow runners, processDevtronAsyncHelmInstallRequest", "err", err, "runner", cdWfr, "pipelineId", overrideRequest.PipelineId)
Expand Down Expand Up @@ -2039,9 +2039,17 @@ func (impl *WorkflowDagExecutorImpl) TriggerDeployment(cdWf *pipelineConfig.CdWo
}

releaseErr := impl.TriggerCD(artifact, cdWf.Id, savedWfr.Id, pipeline, triggeredAt)
// if releaseErr found, then the mark current deployment Failed and return
if releaseErr != nil {
err := impl.MarkCurrentDeploymentFailed(runner, releaseErr, triggeredBy)
if err != nil {
impl.logger.Errorw("error while updating current runner status to failed, updatePreviousDeploymentStatus", "cdWfr", runner.Id, "err", err)
}
return releaseErr
}
//skip updatePreviousDeploymentStatus if Async Install is enabled; handled inside SubscribeDevtronAsyncHelmInstallRequest
if !impl.appService.IsDevtronAsyncInstallModeEnabled(pipeline.DeploymentAppType) {
err1 := impl.updatePreviousDeploymentStatus(releaseErr, runner, pipeline.Id, triggeredAt, triggeredBy)
err1 := impl.updatePreviousDeploymentStatus(runner, pipeline.Id, triggeredAt, triggeredBy)
if err1 != nil {
impl.logger.Errorw("error while update previous cd workflow runners", "err", err, "runner", runner, "pipelineId", pipeline.Id)
return err1
Expand All @@ -2050,16 +2058,7 @@ func (impl *WorkflowDagExecutorImpl) TriggerDeployment(cdWf *pipelineConfig.CdWo
return nil
}

func (impl *WorkflowDagExecutorImpl) updatePreviousDeploymentStatus(releaseErr error, currentRunner *pipelineConfig.CdWorkflowRunner, pipelineId int, triggeredAt time.Time, triggeredBy int32) error {
// if releaseErr found, then the mark current deployment Failed and return
if releaseErr != nil {
err := impl.MarkCurrentDeploymentFailed(currentRunner, releaseErr, triggeredBy)
if err != nil {
impl.logger.Errorw("error while updating current runner status to failed, updatePreviousDeploymentStatus", "cdWfr", currentRunner.Id, "err", err)
return releaseErr
}
return releaseErr
}
func (impl *WorkflowDagExecutorImpl) updatePreviousDeploymentStatus(currentRunner *pipelineConfig.CdWorkflowRunner, pipelineId int, triggeredAt time.Time, triggeredBy int32) error {
// Initiating DB transaction
dbConnection := impl.cdWorkflowRepository.GetConnection()
tx, err := dbConnection.Begin()
Expand Down Expand Up @@ -2381,12 +2380,19 @@ func (impl *WorkflowDagExecutorImpl) ManualCdTrigger(overrideRequest *bean.Value
var releaseErr error
releaseId, _, releaseErr = impl.HandleCDTriggerRelease(overrideRequest, ctx, triggeredAt, overrideRequest.UserId)
span.End()

// if releaseErr found, then the mark current deployment Failed and return
if releaseErr != nil {
err := impl.MarkCurrentDeploymentFailed(runner, releaseErr, overrideRequest.UserId)
if err != nil {
impl.logger.Errorw("error while updating current runner status to failed, updatePreviousDeploymentStatus", "cdWfr", runner.Id, "err", err)
}
return 0, releaseErr
}
//skip updatePreviousDeploymentStatus if Async Install is enabled; handled inside SubscribeDevtronAsyncHelmInstallRequest
if !impl.appService.IsDevtronAsyncInstallModeEnabled(cdPipeline.DeploymentAppType) {
// Update previous deployment runner status (in transaction): Failed
_, span = otel.Tracer("orchestrator").Start(ctx, "updatePreviousDeploymentStatus")
err1 := impl.updatePreviousDeploymentStatus(releaseErr, runner, cdPipeline.Id, triggeredAt, overrideRequest.UserId)
err1 := impl.updatePreviousDeploymentStatus(runner, cdPipeline.Id, triggeredAt, overrideRequest.UserId)
span.End()
if err1 != nil {
impl.logger.Errorw("error while update previous cd workflow runners, ManualCdTrigger", "err", err, "runner", runner, "pipelineId", cdPipeline.Id)
Expand Down
Loading