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

Reinitialize should allow to override existing config in collationGeneration #4833

Merged
merged 6 commits into from
Jun 23, 2024
Merged

Reinitialize should allow to override existing config in collationGeneration #4833

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e25b886
two new messages that allow for better configuration of the collatorG…
girazoki Jun 19, 2024
2bba364
remove new messages and override config in reinitialize
girazoki Jun 21, 2024
a7b31e1
prdoc
girazoki Jun 21, 2024
6cb5f14
Update prdoc/pr_4833.prdoc
bkchr Jun 23, 2024
338392a
Update prdoc/pr_4833.prdoc
bkchr Jun 23, 2024
c088792
Merge branch 'master' into girazoki-allow-clearing-existing-config
bkchr Jun 23, 2024
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
6 changes: 1 addition & 5 deletions polkadot/node/collation-generation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,7 @@ impl CollationGenerationSubsystem {
Ok(FromOrchestra::Communication {
msg: CollationGenerationMessage::Reinitialize(config),
}) => {
if self.config.is_none() {
gum::error!(target: LOG_TARGET, "no initial initialization");
} else {
self.config = Some(Arc::new(config));
}
self.config = Some(Arc::new(config));
false
},
Ok(FromOrchestra::Communication {
Expand Down
12 changes: 12 additions & 0 deletions prdoc/pr_4833.prdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
title: "Reinitialize should allow to override existing config in collationGeneration"

doc:
- audience: Node Dev
description: |
The Reinitialize collationGeneration subsystem message currently fails if no other config is already set_block_length.
bkchr marked this conversation as resolved.
Show resolved Hide resolved
As it is difficult to query the collationGeneration subsystem to check when to call Initialize or Reinitialize, this PR
proposes that Reinitialize overrides the configuration regardless if there was one already set.

crates:
- name: polkadot-node-collation-generation
bump: none
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be patch as the behaviour changes.

bkchr marked this conversation as resolved.
Show resolved Hide resolved
Loading