Skip to content

Decrease the log level for claim queue inconsistency in ClaimQueueState#11417

Merged
tdimitrov merged 7 commits intomasterfrom
tsv-cq-noisy-warn
Mar 23, 2026
Merged

Decrease the log level for claim queue inconsistency in ClaimQueueState#11417
tdimitrov merged 7 commits intomasterfrom
tsv-cq-noisy-warn

Conversation

@tdimitrov
Copy link
Copy Markdown
Contributor

@tdimitrov tdimitrov commented Mar 18, 2026

While testing the collator protocol revamp on westend I noticed "Inconsistency while adding a leaf to the ClaimQueueState. Expected on session change." pops up a lot at regular intervals.

Long story short, when writing this code I assumed that the CQ never change but from a ClaimQueueState point of view this is not true. On session change the validators in the active set are reshuffled and end up in different backing groups. ON group rotation the validators are assigned on a new core. In this case we start fetching the claim queue for the newly assigned core and the future assignments in ClaimQueueState are no longer valid so overwriting them is the right thing to do.

We could also implement a logic which detects assignment change, notifies the claim queue and cleans it up but it's an additional complexity which doesn't add any benefits.

@tdimitrov tdimitrov requested a review from alindima March 18, 2026 14:52
@tdimitrov tdimitrov added A4-backport-stable2512 Pull request must be backported to the stable2512 release branch A4-backport-stable2603 Pull request must be backported to the stable2603 release branch labels Mar 18, 2026
@tdimitrov
Copy link
Copy Markdown
Contributor Author

/cmd prdoc --audience node_dev --bump patch

@tdimitrov tdimitrov enabled auto-merge March 23, 2026 09:46
@tdimitrov tdimitrov added this pull request to the merge queue Mar 23, 2026
Merged via the queue into master with commit 4afd7bd Mar 23, 2026
248 of 249 checks passed
@tdimitrov tdimitrov deleted the tsv-cq-noisy-warn branch March 23, 2026 11:09
@paritytech-release-backport-bot
Copy link
Copy Markdown

Created backport PR for stable2512:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-11417-to-stable2512
git worktree add --checkout .worktree/backport-11417-to-stable2512 backport-11417-to-stable2512
cd .worktree/backport-11417-to-stable2512
git reset --hard HEAD^
git cherry-pick -x 4afd7bdd4b9e066f2d1da68b971f9938de214b3c
git push --force-with-lease

paritytech-release-backport-bot Bot pushed a commit that referenced this pull request Mar 23, 2026
…ate` (#11417)

While testing the collator protocol revamp on westend I noticed
"Inconsistency while adding a leaf to the `ClaimQueueState`. Expected on
session change." pops up a lot at regular intervals.

Long story short, when writing this code I assumed that the CQ never
change but from a `ClaimQueueState` point of view this is not true. ~~On
session change the validators in the active set are reshuffled and end
up in different backing groups.~~ ON group rotation the validators are
assigned on a new core. In this case we start fetching the claim queue
for the newly assigned core and the future assignments in
`ClaimQueueState` are no longer valid so overwriting them is the right
thing to do.

We could also implement a logic which detects assignment change,
notifies the claim queue and cleans it up but it's an additional
complexity which doesn't add any benefits.

---------

Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 4afd7bd)
@paritytech-release-backport-bot
Copy link
Copy Markdown

Successfully created backport PR for stable2603:

EgorPopelyaev pushed a commit that referenced this pull request Mar 24, 2026
Backport #11417 into `stable2603` from tdimitrov.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Tsvetomir Dimitrov <tsvetomir@parity.io>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A4-backport-stable2512 Pull request must be backported to the stable2512 release branch A4-backport-stable2603 Pull request must be backported to the stable2603 release branch

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants