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.

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

Bridges - revert-back congestion mechanism #6781

Merged
merged 19 commits into from
Dec 10, 2024

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Dec 7, 2024

Closes: #5551

Description

With permissionless lanes PR#4949, the congestion mechanism based on sending Transact(report_bridge_status(is_congested)) from pallet-xcm-bridge-hub to pallet-xcm-bridge-hub-router was replaced with a congestion mechanism that relied on monitoring XCMP queues. However, this approach could cause issues, such as suspending the entire XCMP queue instead of isolating the affected bridge. This PR reverts back to using report_bridge_status as before.

TODO

  • benchmarks
  • prdoc

Follow-up

#6231

@bkontur bkontur added the T15-bridges This PR/Issue is related to bridges. label Dec 7, 2024
@paritytech-review-bot paritytech-review-bot bot requested a review from a team December 7, 2024 00:43
@bkontur
Copy link
Contributor Author

bkontur commented Dec 7, 2024

/cmd fmt

Copy link

github-actions bot commented Dec 7, 2024

Command "fmt" has started 🚀 See logs here

Copy link

github-actions bot commented Dec 7, 2024

Command "fmt" has finished ✅ See logs here

@bkontur
Copy link
Contributor Author

bkontur commented Dec 7, 2024

bot bench cumulus-assets --runtime=asset-hub-westend --pallet=pallet_xcm_bridge_hub_router
bot bench cumulus-assets --runtime=asset-hub-rococo --pallet=pallet_xcm_bridge_hub_router

bot bench cumulus-bridge-hubs --runtime=bridge-hub-rococo --pallet=pallet_xcm_bridge_hub
bot bench cumulus-bridge-hubs --runtime=bridge-hub-westend --pallet=pallet_xcm_bridge_hub

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875763 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-westend --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 10-385f527c-4c4d-48ad-a96d-b8c29f3e2965 to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875764 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-rococo --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 11-43b17d25-8e95-4b20-b28a-7f5c33eb2fce to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875765 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=bridge-hub-rococo --runtime_dir=bridge-hubs --target_dir=cumulus --pallet=pallet_xcm_bridge_hub. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 12-e6e3813b-0f45-484f-bf55-2f506dabdd4d to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875766 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=bridge-hub-westend --runtime_dir=bridge-hubs --target_dir=cumulus --pallet=pallet_xcm_bridge_hub. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 13-0d7458f7-3bd0-4e26-a52a-ba31fbdc45e1 to cancel this command or bot cancel to cancel all commands in this pull request.

@bkontur
Copy link
Contributor Author

bkontur commented Dec 7, 2024

/cmd prdoc --audience runtime_dev --bump patch

prdoc/pr_6781.prdoc Outdated Show resolved Hide resolved
prdoc/pr_6781.prdoc Outdated Show resolved Hide resolved
@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-rococo --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875764 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875764/artifacts/download.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-westend --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875763 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875763/artifacts/download.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=bridge-hub-westend --runtime_dir=bridge-hubs --target_dir=cumulus --pallet=pallet_xcm_bridge_hub has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875766 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875766/artifacts/download.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur Command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=bridge-hub-rococo --runtime_dir=bridge-hubs --target_dir=cumulus --pallet=pallet_xcm_bridge_hub has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875765 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7875765/artifacts/download.

@paritytech-workflow-stopper
Copy link

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/12215986550
Failed job name: build-rustdoc

@bkontur
Copy link
Contributor Author

bkontur commented Dec 7, 2024

bot bench cumulus-assets --runtime=asset-hub-westend --pallet=pallet_xcm_bridge_hub_router
bot bench cumulus-assets --runtime=asset-hub-rococo --pallet=pallet_xcm_bridge_hub_router

bot bench cumulus-bridge-hubs --runtime=bridge-hub-rococo --pallet=pallet_xcm_bridge_hub
bot bench cumulus-bridge-hubs --runtime=bridge-hub-westend --pallet=pallet_xcm_bridge_hub

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7876021 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-westend --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 14-d485bcf0-4442-405c-bdd8-0f51f1ce74bb to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7876022 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=asset-hub-rococo --runtime_dir=assets --target_dir=cumulus --pallet=pallet_xcm_bridge_hub_router. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 15-6f5d75c3-c427-4ec5-9158-8bc46ca47c45 to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Dec 7, 2024

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7876023 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/bench/bench.sh" --subcommand=pallet --runtime=bridge-hub-rococo --runtime_dir=bridge-hubs --target_dir=cumulus --pallet=pallet_xcm_bridge_hub. Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 16-fa2df385-dd53-4889-aa21-3d2b7c1e117f to cancel this command or bot cancel to cancel all commands in this pull request.

@bkontur bkontur self-assigned this Dec 8, 2024
@bkontur bkontur added the A4-needs-backport Pull request must be backported to all maintained releases. label Dec 9, 2024
@bkontur bkontur enabled auto-merge December 9, 2024 11:34
@bkontur bkontur added this pull request to the merge queue Dec 10, 2024
Merged via the queue into master with commit 8f4b99c Dec 10, 2024
196 of 199 checks passed
@bkontur bkontur deleted the bko-bridges-revert-congestion branch December 10, 2024 06:35
@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2407:

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

git fetch origin backport-6781-to-stable2407
git worktree add --checkout .worktree/backport-6781-to-stable2407 backport-6781-to-stable2407
cd .worktree/backport-6781-to-stable2407
git reset --hard HEAD^
git cherry-pick -x 8f4b99cffabbe9edaa9c29f451e45cfdb4674adc
git push --force-with-lease

@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2409:

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

git fetch origin backport-6781-to-stable2409
git worktree add --checkout .worktree/backport-6781-to-stable2409 backport-6781-to-stable2409
cd .worktree/backport-6781-to-stable2409
git reset --hard HEAD^
git cherry-pick -x 8f4b99cffabbe9edaa9c29f451e45cfdb4674adc
git push --force-with-lease

@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2412:

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

git fetch origin backport-6781-to-stable2412
git worktree add --checkout .worktree/backport-6781-to-stable2412 backport-6781-to-stable2412
cd .worktree/backport-6781-to-stable2412
git reset --hard HEAD^
git cherry-pick -x 8f4b99cffabbe9edaa9c29f451e45cfdb4674adc
git push --force-with-lease

bkontur added a commit that referenced this pull request Dec 10, 2024
Closes: #5551

## Description

With [permissionless lanes
PR#4949](#4949), the
congestion mechanism based on sending
`Transact(report_bridge_status(is_congested))` from
`pallet-xcm-bridge-hub` to `pallet-xcm-bridge-hub-router` was replaced
with a congestion mechanism that relied on monitoring XCMP queues.
However, this approach could cause issues, such as suspending the entire
XCMP queue instead of isolating the affected bridge. This PR reverts
back to using `report_bridge_status` as before.

## TODO
- [x] benchmarks
- [x] prdoc

## Follow-up

#6231

---------

Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: command-bot <>
Co-authored-by: Adrian Catangiu <[email protected]>
(cherry picked from commit 8f4b99c)

# Conflicts:
#	Cargo.lock
#	cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
#	cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
EgorPopelyaev pushed a commit that referenced this pull request Dec 11, 2024
Backport #6781 into `stable2412` from bkontur.

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: Branislav Kontur <[email protected]>
EgorPopelyaev pushed a commit that referenced this pull request Dec 11, 2024
Backport #6781 into `stable2409` from bkontur.

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: Branislav Kontur <[email protected]>
Ank4n pushed a commit that referenced this pull request Dec 15, 2024
Closes: #5551

## Description

With [permissionless lanes
PR#4949](#4949), the
congestion mechanism based on sending
`Transact(report_bridge_status(is_congested))` from
`pallet-xcm-bridge-hub` to `pallet-xcm-bridge-hub-router` was replaced
with a congestion mechanism that relied on monitoring XCMP queues.
However, this approach could cause issues, such as suspending the entire
XCMP queue instead of isolating the affected bridge. This PR reverts
back to using `report_bridge_status` as before.

## TODO
- [x] benchmarks
- [x] prdoc

## Follow-up

#6231

---------

Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: command-bot <>
Co-authored-by: Adrian Catangiu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A4-needs-backport Pull request must be backported to all maintained releases. T15-bridges This PR/Issue is related to bridges.
Projects
Status: Done
Status: Scheduled
Development

Successfully merging this pull request may close these issues.

Add LocalXcmChannelManager impls for XcmpQueue and BridgeHubs
5 participants