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

Begin hyper upgrade in lading/ #1182

Merged
merged 8 commits into from
Dec 30, 2024
Merged

Begin hyper upgrade in lading/ #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ec0361
Begin hyper upgrade in lading/
blt Dec 24, 2024
19f3920
checkpoint
blt Dec 27, 2024
2394ad7
checkpoint
blt Dec 27, 2024
3672a6f
checkpoint
blt Dec 27, 2024
e769000
checkpoint
blt Dec 27, 2024
8316502
checkpoint
blt Dec 27, 2024
044d8c8
checkpoint
blt Dec 27, 2024
d680606
compilation passes
blt Dec 27, 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
42 changes: 8 additions & 34 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions lading/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ flate2 = { version = "1.0.34", default-features = false, features = [
futures = "0.3.31"
fuser = { version = "0.15", optional = true }
heck = { version = "0.5", default-features = false }
http = "0.2"
http-serde = "1.1"
hyper = { workspace = true, features = ["backports", "client", "deprecated", "http1", "http2", "server"] }
http = "1.2"
http-serde = "2.1"
hyper = { version = "1.5", features = ["client", "http1", "http2", "server"] }
http-body-util = "0.1"
hyper-util = { version = "0.1", features = ["default", "client", "client-legacy"] }
is_executable = "1.0.4"
metrics = { workspace = true }
metrics-exporter-prometheus = { workspace = true }
Expand Down Expand Up @@ -76,7 +78,7 @@ tokio = { workspace = true, features = [
] }
tokio-stream = { version = "0.1", features = ["io-util"] }
tokio-util = { version = "0.7", features = ["io"] }
tonic = { version = "0.9" }
tonic = { version = "0.12" }
tower = { workspace = true, features = [
"timeout",
"limit",
Expand Down
139 changes: 85 additions & 54 deletions lading/src/blackhole/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
//! `requests_received`: Total requests received
//!

use std::{net::SocketAddr, time::Duration};
use std::{net::SocketAddr, sync::Arc, time::Duration};

use bytes::Bytes;
use http::{header::InvalidHeaderValue, status::InvalidStatusCode, HeaderMap};
use hyper::{
body::HttpBody,
header,
server::conn::{AddrIncoming, AddrStream},
service::{make_service_fn, service_fn},
Body, Request, Response, Server, StatusCode,
use http_body_util::{combinators::BoxBody, BodyExt};
use hyper::{header, service::service_fn, Request, Response, StatusCode};
use hyper_util::{
rt::{TokioExecutor, TokioIo},
server::conn::auto,
};
use metrics::counter;
use serde::{Deserialize, Serialize};
use tower::ServiceBuilder;
use tokio::{pin, sync::Semaphore, task::JoinSet};
use tracing::{debug, error, info};

use super::General;
Expand All @@ -42,6 +42,9 @@ pub enum Error {
/// Failed to deserialize the configuration.
#[error("Failed to deserialize the configuration: {0}")]
Serde(#[from] serde_json::Error),
/// Wrapper for [`std::io::Error`].
#[error("IO error: {0}")]
Io(#[from] std::io::Error),
}

/// Body variant supported by this blackhole.
Expand Down Expand Up @@ -129,18 +132,21 @@ async fn srv(
status: StatusCode,
metric_labels: Vec<(String, String)>,
body_bytes: Vec<u8>,
req: Request<Body>,
req: Request<hyper::body::Incoming>,
headers: HeaderMap,
response_delay: Duration,
) -> Result<Response<Body>, hyper::Error> {
) -> Result<hyper::Response<BoxBody<Bytes, hyper::Error>>, hyper::Error> {
counter!("requests_received", &metric_labels).increment(1);

// Split into parts
let (parts, body) = req.into_parts();

let bytes = body.collect().await?.to_bytes();
counter!("bytes_received", &metric_labels).increment(bytes.len() as u64);
// Convert the `Body` into `Bytes`
let body: Bytes = body.boxed().collect().await?.to_bytes();

match crate::codec::decode(parts.headers.get(hyper::header::CONTENT_ENCODING), bytes) {
counter!("bytes_received", &metric_labels).increment(body.len() as u64);

match crate::codec::decode(parts.headers.get(hyper::header::CONTENT_ENCODING), body) {
Err(response) => Ok(response),
Ok(body) => {
counter!("decoded_bytes_received", &metric_labels).increment(body.len() as u64);
Expand All @@ -150,7 +156,7 @@ async fn srv(
let mut okay = Response::default();
*okay.status_mut() = status;
*okay.headers_mut() = headers;
*okay.body_mut() = Body::from(body_bytes);
*okay.body_mut() = crate::full(body_bytes);
Ok(okay)
}
}
Expand Down Expand Up @@ -234,48 +240,73 @@ impl Http {
/// Function will return an error if the configuration is invalid or if
/// receiving a packet fails.
pub async fn run(self) -> Result<(), Error> {
let service = make_service_fn(|_: &AddrStream| {
let metric_labels = self.metric_labels.clone();
let body_bytes = self.body_bytes.clone();
let headers = self.headers.clone();
async move {
Ok::<_, hyper::Error>(service_fn(move |request| {
debug!("REQUEST: {:?}", request);
srv(
self.status,
metric_labels.clone(),
body_bytes.clone(),
request,
headers.clone(),
self.response_delay,
)
}))
}
});
let svc = ServiceBuilder::new()
.load_shed()
.concurrency_limit(self.concurrency_limit)
.timeout(Duration::from_secs(1))
.service(service);

let addr = AddrIncoming::bind(&self.httpd_addr)
.map(|mut addr| {
addr.set_keepalive(Some(Duration::from_secs(60)));
addr
})
.map_err(Error::Hyper)?;

let server = Server::builder(addr).serve(svc);
tokio::select! {
res = server => {
error!("server shutdown unexpectedly");
res.map_err(Error::Hyper)
}
() = self.shutdown.recv() => {
info!("shutdown signal received");
Ok(())
let listener = tokio::net::TcpListener::bind(self.httpd_addr).await?;
let sem = Arc::new(Semaphore::new(self.concurrency_limit));
let mut join_set = JoinSet::new();

let shutdown = self.shutdown.recv();
pin!(shutdown);
loop {
tokio::select! {
() = &mut shutdown => {
info!("shutdown signal received");
break;
}

incoming = listener.accept() => {
let (stream, addr) = match incoming {
Ok((s,a)) => (s,a),
Err(e) => {
error!("accept error: {e}");
continue;
}
};

let metric_labels = self.metric_labels.clone();
let body_bytes = self.body_bytes.clone();
let headers = self.headers.clone();
let status = self.status;
let response_delay = self.response_delay;
let sem = Arc::clone(&sem);

join_set.spawn(async move {
debug!("Accepted connection from {addr}");
let permit = match sem.acquire_owned().await {
Ok(p) => p,
Err(e) => {
error!("Semaphore closed: {e}");
return;
}
};

let builder = auto::Builder::new(TokioExecutor::new());
let serve_future = builder
.serve_connection(
TokioIo::new(stream),
service_fn(move |req: Request<hyper::body::Incoming>| {
debug!("REQUEST: {:?}", req);
srv(
status,
metric_labels.clone(),
body_bytes.clone(),
req,
headers.clone(),
response_delay,
)
})
);

if let Err(e) = serve_future.await {
error!("Error serving {addr}: {e}");
}
drop(permit);
});
}
}
}
drop(listener);
while join_set.join_next().await.is_some() {}
Ok(())
}
}

Expand Down
Loading
Loading