daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to defend better against unexpected shapes where possible

Browse Source
This commit is contained in:
Dominik Werder
2023-08-30 16:39:00 +02:00
parent ab9a4d69ec
commit 05a31fbad1
21 changed files with 452 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/httpret/src/api4/databuffer_tools.rs
View File

@@ -86,7 +86,7 @@ impl FindActiveHandler {
.headers()
.get(http::header::ACCEPT)
.map_or(accept_def, |k| k.to_str().unwrap_or(accept_def));
let url = {
let _url = {
let s1 = format!("dummy:{}", req.uri());
Url::parse(&s1)?
};
@@ -175,7 +175,7 @@ impl XorShift32 {
async fn find_active_inner(
max: usize,
ks: u32,
splits: &[u64],
_splits: &[u64],
node: Node,
tx: Sender<Result<ActiveChannelDesc, FindActiveError>>,
) -> Result<(), FindActiveError> {
@@ -240,7 +240,9 @@ async fn find_active_inner(
name: chname.into(),
totlen: sum,
};
tx.send(Ok(x)).await;
if let Err(e) = tx.send(Ok(x)).await {
error!("{e}");
}
count += 1;
if count >= max {
break 'outer;
@@ -275,7 +277,9 @@ async fn find_active(
match find_active_inner(max, ks, &splits, node, tx).await {
Ok(x) => x,
Err(e) => {
tx2.send(Err(e)).await;
if let Err(e) = tx2.send(Err(e)).await {
error!("{e}");
}
return;
}
}

10
crates/httpret/src/api4/events.rs
View File

@@ -1,4 +1,4 @@
use crate::channelconfig::chconf_from_events_v1;
use crate::channelconfig::chconf_from_events_quorum;
use crate::err::Error;
use crate::response;
use crate::response_err;
@@ -73,8 +73,8 @@ async fn plain_events_binary(
) -> Result<Response<Body>, Error> {
debug!("{:?}", req);
let query = PlainEventsQuery::from_url(&url).map_err(|e| e.add_public_msg(format!("Can not understand query")))?;
let ch_conf = chconf_from_events_v1(&query, node_config).await?;
info!("plain_events_binary chconf_from_events_v1: {ch_conf:?}");
let ch_conf = chconf_from_events_quorum(&query, node_config).await?;
info!("plain_events_binary chconf_from_events_quorum: {ch_conf:?}");
let s = stream::iter([Ok::<_, Error>(String::from("TODO_PREBINNED_BINARY_STREAM"))]);
let ret = response(StatusCode::OK).body(Body::wrap_stream(s.map_err(Error::from)))?;
Ok(ret)
@@ -91,11 +91,11 @@ async fn plain_events_json(
let query = PlainEventsQuery::from_url(&url)?;
info!("plain_events_json query {query:?}");
// TODO handle None case better and return 404
let ch_conf = chconf_from_events_v1(&query, node_config)
let ch_conf = chconf_from_events_quorum(&query, node_config)
.await
.map_err(Error::from)?
.ok_or_else(|| Error::with_msg_no_trace("channel not found"))?;
info!("plain_events_json chconf_from_events_v1: {ch_conf:?}");
info!("plain_events_json chconf_from_events_quorum: {ch_conf:?}");
let item =
streams::plaineventsjson::plain_events_json(&query, ch_conf, reqid, &node_config.node_config.cluster).await;
let item = match item {