Move backend config key

This commit is contained in:
Dominik Werder
2022-02-21 18:33:36 +01:00
parent 88478f455d
commit 2b49d67eed
9 changed files with 14 additions and 28 deletions

View File

@@ -14,7 +14,6 @@ pub fn make_test_node(id: u32) -> Node {
port_raw: 8800 + id as u16 + 100,
// TODO use a common function to supply the tmp path.
cache_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
backend: "testbackend".into(),
sf_databuffer: Some(SfDatabuffer {
data_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
ksprefix: "ks".into(),

View File

@@ -169,10 +169,10 @@ pub async fn pre_binned_bytes_for_http(
node_config: &NodeConfigCached,
query: &PreBinnedQuery,
) -> Result<Pin<Box<dyn Stream<Item = Result<Bytes, Error>> + Send>>, Error> {
if query.channel().backend != node_config.node.backend {
if query.channel().backend != node_config.node_config.cluster.backend {
let err = Error::with_msg(format!(
"backend mismatch node: {} requested: {}",
node_config.node.backend,
node_config.node_config.cluster.backend,
query.channel().backend
));
return Err(err);

View File

@@ -124,7 +124,6 @@ pub async fn gen_test_data() -> Result<(), Error> {
port: 7780 + i1 as u16,
port_raw: 7780 + i1 as u16 + 100,
cache_base_path: data_base_path.join(format!("node{:02}", i1)),
backend: "testbackend".into(),
sf_databuffer: Some(SfDatabuffer {
data_base_path: data_base_path.join(format!("node{:02}", i1)),
ksprefix: ksprefix.clone(),