Skip to content

Fix wrong condition on determine deployment plannable #2860

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
Nov 29, 2021
Merged

Fix wrong condition on determine deployment plannable #2860

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
30 changes: 22 additions & 8 deletions pkg/app/api/grpcapi/piped_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,15 +1156,29 @@ func (a *PipedAPI) InChainDeploymentPlannable(ctx context.Context, req *pipedser
}

prevBlock := dc.Blocks[req.DeploymentChainBlockIndex-1]
plannable := true
deploymentIds := make([]string, 0, len(prevBlock.Nodes))
for _, node := range prevBlock.Nodes {
// TODO: Consider add deployment status to the deployment ref in the deployment chain model
// instead of fetching deployment model here.
dp, err := a.deploymentStore.GetDeployment(ctx, node.DeploymentRef.DeploymentId)
if err != nil {
return nil, status.Error(codes.Internal, "unable to process previous block nodes in deployment chain")
}
if model.IsSuccessfullyCompletedDeployment(dp.Status) {
deploymentIds = append(deploymentIds, node.DeploymentRef.DeploymentId)
}

// TODO: Consider add deployment status to the deployment ref in the deployment chain model
// instead of fetching deployment model here.
blockDeployments, _, err := a.deploymentStore.ListDeployments(ctx, datastore.ListOptions{
Filters: []datastore.ListFilter{
{
Field: "Id",
Operator: datastore.OperatorIn,
Value: deploymentIds,
},
},
})
if err != nil {
return nil, status.Error(codes.Internal, "unable to process previous block nodes in deployment chain")
}

plannable := true
for _, dp := range blockDeployments {
if !model.IsSuccessfullyCompletedDeployment(dp.Status) {
Comment on lines +1161 to +1181
Copy link
Member

@nghialv nghialv Nov 29, 2021

Choose a reason for hiding this comment

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

Could you tell me what was wrong with determining logic?
Or we just changed from using Get to List with the In operator.

Copy link
Member Author

@khanhtc1202 khanhtc1202 Nov 29, 2021

Choose a reason for hiding this comment

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

The condition is flipped, previously it was

if model.IsSuccessfullyCompletedDeployment(dp.Status) {

Copy link
Member

@nghialv nghialv Nov 29, 2021

Choose a reason for hiding this comment

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

Got it!

Copy link
Member Author

@khanhtc1202 khanhtc1202 Nov 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

And as you said, I changed the implementation to use In operator to reduce database read, but the TODO note has remained. I will address the issue of adding deployment status to the node.DeploymentRef later, currently just want to focus on the deployment chain flow works 🙏

Copy link
Member Author

@khanhtc1202 khanhtc1202 Nov 29, 2021

Choose a reason for hiding this comment

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

Thank you 🙆‍♀️

plannable = false
break
}
Expand Down