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

Fixes #21716 - Fix cancelling when using bulk actions with polling #259

Merged
merged 4 commits into from Dec 14, 2017
Merged

Fixes #21716 - Fix cancelling when using bulk actions with polling #259

merged 4 commits into from Dec 14, 2017

Conversation

adamruzicka
Copy link
Contributor

No description provided.

iNecas
iNecas requested changes Dec 12, 2017
View reviewed changes
Copy link
Member

@iNecas iNecas left a comment

Choose a reason for hiding this comment

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

Not tested yet, but looks promissing, some suggestions insight + rebase needed

lib/dynflow/action/with_bulk_sub_plans.rb Outdated
end

def remaining_count
total_count - output.fetch(:cancelled_count, 0) - output[:planned_count]
Copy link
Member

Choose a reason for hiding this comment

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

What about initiating the value in initiate so that we don't need to do fetch here? There is also the run_progress method that this would be benefitial to have.

@adamruzicka
Copy link
Contributor Author

Fixed and rebased

@iNecas
Copy link
Member

iNecas commented Dec 14, 2017

Ruboocop is not happy

@adamruzicka
Copy link
Contributor Author

Rubocop is finally happy

iNecas
iNecas approved these changes Dec 14, 2017
View reviewed changes
Copy link
Member

@iNecas iNecas left a comment

Choose a reason for hiding this comment

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

Reading the code again, I think the issue we were talking about with potential issues of PlanNextBatch being in queue when cancelling, is actually handled here.

@iNecas iNecas merged commit 8c245ab into Dynflow:master Dec 14, 2017
@iNecas
Copy link
Member

iNecas commented Dec 14, 2017

Thanks @adamruzicka

@adamruzicka adamruzicka deleted the cancel-fix branch December 14, 2017 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iNecas iNecas iNecas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@adamruzicka @iNecas