Skip to content

fix: panic fixes on concurrent delete request #6657

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
merged 1 commit into from
Jun 9, 2025
Merged

fix: panic fixes on concurrent delete request #6657

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
5 changes: 5 additions & 0 deletions pkg/appWorkflow/AppWorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,11 @@ func (impl AppWorkflowServiceImpl) FindAppWorkflowMappingForEnv(appIds []int) (m
workflowMappings := make(map[int][]bean4.AppWorkflowMappingDto)
workflows := make(map[int]*bean4.AppWorkflowDto)
for _, w := range appWorkflowMappings {
if _, ok := pipelineMap[w.ComponentId]; !ok {
impl.Logger.Warnw("pipeline not found for componentId", "componentId", w.ComponentId, "appWorkflowId", w.AppWorkflowId)
// If the pipeline is not found, we skip adding this mapping as one possible reason would be pipeline have been deleted
continue
}
if _, ok := workflows[w.AppWorkflowId]; !ok {
workflows[w.AppWorkflowId] = &bean4.AppWorkflowDto{
Id: w.AppWorkflowId,
Expand Down
5 changes: 5 additions & 0 deletions pkg/pipeline/DeploymentPipelineConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,6 +1821,11 @@ func (impl *CdPipelineConfigServiceImpl) GetCdPipelinesByEnvironment(request res
}

for _, dbPipeline := range authorizedPipelines {
if _, ok := pipelineWorkflowMapping[dbPipeline.Id]; !ok {
// can be due to concurrent deletion of pipeline, app workflow mapping
impl.logger.Warnw("pipeline workflow mapping not found for pipeline", "pipelineId", dbPipeline.Id)
continue
}
var customTag *bean.CustomTagData
var customTagStage repository5.PipelineStageType
customTagPreCD := customTagMapResponse.GetCustomTagForEntityKey(pipelineConfigBean.EntityTypePreCD, strconv.Itoa(dbPipeline.Id))
Expand Down
Loading