Skip to content

Allow multiple BlocklistSubmission in parallel for the same version#24728

Merged
diox merged 5 commits intomozilla:masterfrom
diox:parallel-blocklist-submissions
Apr 14, 2026
Merged

Allow multiple BlocklistSubmission in parallel for the same version#24728
diox merged 5 commits intomozilla:masterfrom
diox:parallel-blocklist-submissions

Conversation

@diox
Copy link
Copy Markdown
Member

@diox diox commented Apr 10, 2026

Conflicts are resolved automatically when setting up the block depending on the BlocklistSubmission action: an ADDCHANGE action is never allowed to "downgrade" a block_type, only an expicit SOFTEN can do that. In addition, adding a delay on a SOFTEN action is disallowed.

Fixes mozilla/addons#16117

diox added 2 commits April 10, 2026 14:10
Conflicts are resolved automatically when setting up the block
depending on the BlocklistSubmission action: an ADDCHANGE action
is never allowed to "downgrade" a block_type, only an expicit
SOFTEN can do that. In addition, adding a delay on a SOFTEN
action is disallowed.
@diox diox marked this pull request as ready for review April 10, 2026 14:29
@diox diox requested a review from eviljeff April 10, 2026 14:29
Copy link
Copy Markdown
Member

@eviljeff eviljeff left a comment

Choose a reason for hiding this comment

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

In addition, adding a delay on a SOFTEN action is disallowed.

Do we need to enforce this elsewhere - e.g. in the models itself? BlocklistSubmissions can be created automatically now/soon.

Comment thread src/olympia/blocklist/models.py Outdated
@diox
Copy link
Copy Markdown
Member Author

diox commented Apr 13, 2026

Do we need to enforce this elsewhere - e.g. in the models itself? BlocklistSubmissions can be created automatically now/soon.

I don't think it's necessary (famous last words). We should never have automation adding a delay with a soften action in the first place, softening is really meant to fix a situation were we were too harsh, I don't see a situation where we would want to automatically do that with a delay.

@diox diox merged commit 4a2c531 into mozilla:master Apr 14, 2026
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Task]: Support having multiple block submissions in parallel

2 participants