Skip to content

storage: fix dyncfg implementation #26189

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

Merged
merged 1 commit into from
Mar 21, 2024
Merged

storage: fix dyncfg implementation #26189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/storage-controller/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,10 @@ where
}
}

fn update_parameters(&mut self, mut config_params: StorageParameters) {
fn update_parameters(&mut self, config_params: StorageParameters) {
// We serialize the dyncfg updates in StorageParameters, but configure
// persist separately.
if let Some(updates) = config_params.dyncfg_updates.take() {
if let Some(updates) = &config_params.dyncfg_updates {
updates.apply(self.persist.cfg());
}

Expand Down
4 changes: 2 additions & 2 deletions src/storage/src/storage_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,13 +1196,13 @@ impl StorageState {
match cmd {
StorageCommand::CreateTimely { .. } => panic!("CreateTimely must be captured before"),
StorageCommand::InitializationComplete => (),
StorageCommand::UpdateConfiguration(mut params) => {
StorageCommand::UpdateConfiguration(params) => {
// These can be done from all workers safely.
tracing::info!("Applying configuration update: {params:?}");

// We serialize the dyncfg updates in StorageParameters, but configure
// persist separately.
if let Some(updates) = params.dyncfg_updates.take() {
if let Some(updates) = &params.dyncfg_updates {
updates.apply(self.persist_clients.cfg());
}

Expand Down