Skip to content

Commit

Permalink
fix: (v1.2) ignore unrecogized/deprecated system params (#12253)
Browse files Browse the repository at this point in the history
Co-authored-by: Noel Kwan <[email protected]>
  • Loading branch information
fuyufjh and kwannoel authored Sep 14, 2023
1 parent 0f94fdf commit c272d3f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions ci/scripts/regress-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ mv target/debug/risingwave_regress_test-"$profile" target/debug/risingwave_regre
chmod +x ./target/debug/risingwave_regress_test

echo "--- Postgres regress test"
apt-get -y update
apt-get -y install locales
locale-gen C
export LANGUAGE=C
Expand Down
9 changes: 4 additions & 5 deletions src/common/src/system_param/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,9 @@ macro_rules! impl_system_params_from_kv {
std::str::from_utf8(v.as_ref()).unwrap().to_string()
)
}).collect::<Vec<_>>();
Err(format!("unrecognized system params {:?}", unrecognized_params))
} else {
Ok(ret)
tracing::warn!("unrecognized system params {:?}", unrecognized_params);
}
Ok(ret)
}
};
}
Expand Down Expand Up @@ -378,8 +377,8 @@ mod tests {
let p = PbSystemParams::default();
assert!(system_params_to_kv(&p).is_err());

// From kv - unrecognized field.
assert!(system_params_from_kv(vec![("?", "?")]).is_err());
// From kv - unrecognized field should be ignored
assert!(system_params_from_kv(vec![("?", "?")]).is_ok());

// Deser & ser.
let p = system_params_from_kv(kvs).unwrap();
Expand Down

0 comments on commit c272d3f

Please sign in to comment.