aboutsummaryrefslogtreecommitdiff
path: root/src/api_server.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-04-08 00:39:07 +0200
committerAlex Auvolat <alex@adnab.me>2020-04-08 00:39:07 +0200
commitd50edcdb4f8b8ec00b1f0ffb6a3ebbb0e5afdc1f (patch)
treeb283abf578b3c80c2885eb0e220f7f3a02ba994d /src/api_server.rs
parent90cdffb425c6222f4234db54a16c079d8c058724 (diff)
downloadgarage-d50edcdb4f8b8ec00b1f0ffb6a3ebbb0e5afdc1f.tar.gz
garage-d50edcdb4f8b8ec00b1f0ffb6a3ebbb0e5afdc1f.zip
Basic workflow for client PUT, next is do actual storage
Diffstat (limited to 'src/api_server.rs')
-rw-r--r--src/api_server.rs236
1 files changed, 187 insertions, 49 deletions
diff --git a/src/api_server.rs b/src/api_server.rs
index cf70dbdf..c1b4d81d 100644
--- a/src/api_server.rs
+++ b/src/api_server.rs
@@ -1,68 +1,29 @@
use std::sync::Arc;
+use std::net::SocketAddr;
+use std::collections::VecDeque;
-use futures_util::TryStreamExt;
+use futures::stream::StreamExt;
use hyper::service::{make_service_fn, service_fn};
+use hyper::server::conn::AddrStream;
use hyper::{Body, Method, Request, Response, Server, StatusCode};
use futures::future::Future;
use crate::error::Error;
use crate::membership::System;
-
-/// This is our service handler. It receives a Request, routes on its
-/// path, and returns a Future of a Response.
-async fn handler(sys: Arc<System>, req: Request<Body>) -> Result<Response<Body>, Error> {
- match (req.method(), req.uri().path()) {
- // Serve some instructions at /
- (&Method::GET, "/") => Ok(Response::new(Body::from(
- "Try POSTing data to /echo such as: `curl localhost:3000/echo -XPOST -d 'hello world'`",
- ))),
-
- // Simply echo the body back to the client.
- (&Method::POST, "/echo") => Ok(Response::new(req.into_body())),
-
- // Convert to uppercase before sending back to client using a stream.
- (&Method::POST, "/echo/uppercase") => {
- let chunk_stream = req.into_body().map_ok(|chunk| {
- chunk
- .iter()
- .map(|byte| byte.to_ascii_uppercase())
- .collect::<Vec<u8>>()
- });
- Ok(Response::new(Body::wrap_stream(chunk_stream)))
- }
-
- // Reverse the entire body before sending back to the client.
- //
- // Since we don't know the end yet, we can't simply stream
- // the chunks as they arrive as we did with the above uppercase endpoint.
- // So here we do `.await` on the future, waiting on concatenating the full body,
- // then afterwards the content can be reversed. Only then can we return a `Response`.
- (&Method::POST, "/echo/reversed") => {
- let whole_body = hyper::body::to_bytes(req.into_body()).await?;
-
- let reversed_body = whole_body.iter().rev().cloned().collect::<Vec<u8>>();
- Ok(Response::new(Body::from(reversed_body)))
- }
-
- // Return the 404 Not Found for other routes.
- _ => {
- let mut not_found = Response::default();
- *not_found.status_mut() = StatusCode::NOT_FOUND;
- Ok(not_found)
- }
- }
-}
+use crate::data::*;
+use crate::proto::*;
+use crate::rpc_client::*;
pub async fn run_api_server(sys: Arc<System>, shutdown_signal: impl Future<Output=()>) -> Result<(), hyper::Error> {
let addr = ([0, 0, 0, 0], sys.config.api_port).into();
- let service = make_service_fn(|_| {
+ let service = make_service_fn(|conn: &AddrStream| {
let sys = sys.clone();
+ let client_addr = conn.remote_addr();
async move {
- let sys = sys.clone();
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
let sys = sys.clone();
- handler(sys, req)
+ handler(sys, req, client_addr)
}))
}
});
@@ -74,3 +35,180 @@ pub async fn run_api_server(sys: Arc<System>, shutdown_signal: impl Future<Outpu
graceful.await
}
+
+async fn handler(sys: Arc<System>, req: Request<Body>, addr: SocketAddr) -> Result<Response<Body>, Error> {
+ match handler_inner(sys, req, addr).await {
+ Ok(x) => Ok(x),
+ Err(Error::BadRequest(e)) => {
+ let mut bad_request = Response::new(Body::from(format!("{}\n", e)));
+ *bad_request.status_mut() = StatusCode::BAD_REQUEST;
+ Ok(bad_request)
+ }
+ Err(e) => {
+ let mut ise = Response::new(Body::from(
+ format!("Internal server error: {}\n", e)));
+ *ise.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
+ Ok(ise)
+ }
+ }
+}
+
+async fn handler_inner(sys: Arc<System>, req: Request<Body>, addr: SocketAddr) -> Result<Response<Body>, Error> {
+ eprintln!("{} {} {}", addr, req.method(), req.uri());
+
+ let bucket = req.headers()
+ .get(hyper::header::HOST)
+ .map(|x| x.to_str().map_err(Error::from))
+ .unwrap_or(Err(Error::BadRequest(format!("Host: header missing"))))?
+ .to_lowercase();
+ let key = req.uri().path().to_string();
+
+ match req.method() {
+ &Method::GET => {
+ Ok(Response::new(Body::from(
+ "TODO: implement GET object",
+ )))
+ }
+ &Method::PUT => {
+ let mime_type = req.headers()
+ .get(hyper::header::CONTENT_TYPE)
+ .map(|x| x.to_str())
+ .unwrap_or(Ok("blob"))?
+ .to_string();
+ let version_uuid = handle_put(sys, &mime_type, &bucket, &key, req.into_body()).await?;
+ Ok(Response::new(Body::from(
+ format!("Version UUID: {:?}", version_uuid),
+ )))
+ }
+ _ => Err(Error::BadRequest(format!("Invalid method"))),
+ }
+}
+
+async fn handle_put(sys: Arc<System>,
+ mime_type: &str,
+ bucket: &str, key: &str, body: Body)
+ -> Result<UUID, Error>
+{
+ let version_uuid = gen_uuid();
+
+ let mut chunker = BodyChunker::new(body, sys.config.block_size);
+ let first_block = match chunker.next().await? {
+ Some(x) => x,
+ None => return Err(Error::BadRequest(format!("Empty body"))),
+ };
+
+ let mut version = VersionMeta{
+ bucket: bucket.to_string(),
+ key: key.to_string(),
+ timestamp: now_msec(),
+ uuid: version_uuid.clone(),
+ mime_type: mime_type.to_string(),
+ size: first_block.len() as u64,
+ is_complete: false,
+ data: VersionData::DeleteMarker,
+ };
+ let version_who = sys.members.read().await
+ .walk_ring(&version_uuid, sys.config.meta_replication_factor);
+
+ if first_block.len() < INLINE_THRESHOLD {
+ version.data = VersionData::Inline(first_block);
+ version.is_complete = true;
+ rpc_try_call_many(sys.clone(),
+ &version_who[..],
+ &Message::AdvertiseVersion(version),
+ (sys.config.meta_replication_factor+1)/2,
+ DEFAULT_TIMEOUT).await?;
+ return Ok(version_uuid)
+ }
+
+ let first_block_hash = hash(&first_block[..]);
+ version.data = VersionData::FirstBlock(first_block_hash);
+ rpc_try_call_many(sys.clone(),
+ &version_who[..],
+ &Message::AdvertiseVersion(version.clone()),
+ (sys.config.meta_replication_factor+1)/2,
+ DEFAULT_TIMEOUT).await?;
+
+ let block_meta = BlockMeta{
+ version_uuid: version_uuid.clone(),
+ offset: 0,
+ hash: hash(&first_block[..]),
+ };
+ let mut next_offset = first_block.len();
+ let mut put_curr_block = put_block(sys.clone(), block_meta, first_block);
+ loop {
+ let (_, next_block) = futures::try_join!(put_curr_block, chunker.next())?;
+ if let Some(block) = next_block {
+ let block_meta = BlockMeta{
+ version_uuid: version_uuid.clone(),
+ offset: next_offset as u64,
+ hash: hash(&block[..]),
+ };
+ next_offset += block.len();
+ put_curr_block = put_block(sys.clone(), block_meta, block);
+ } else {
+ break;
+ }
+ }
+
+ // TODO: if at any step we have an error, we should undo everything we did
+
+ version.is_complete = true;
+ rpc_try_call_many(sys.clone(),
+ &version_who[..],
+ &Message::AdvertiseVersion(version),
+ (sys.config.meta_replication_factor+1)/2,
+ DEFAULT_TIMEOUT).await?;
+ Ok(version_uuid)
+}
+
+async fn put_block(sys: Arc<System>, meta: BlockMeta, data: Vec<u8>) -> Result<(), Error> {
+ let who = sys.members.read().await
+ .walk_ring(&meta.hash, sys.config.meta_replication_factor);
+ rpc_try_call_many(sys.clone(),
+ &who[..],
+ &Message::PutBlock(PutBlockMessage{
+ meta,
+ data,
+ }),
+ (sys.config.meta_replication_factor+1)/2,
+ DEFAULT_TIMEOUT).await?;
+ Ok(())
+}
+
+struct BodyChunker {
+ body: Body,
+ block_size: usize,
+ buf: VecDeque<u8>,
+}
+
+impl BodyChunker {
+ fn new(body: Body, block_size: usize) -> Self {
+ Self{
+ body,
+ block_size,
+ buf: VecDeque::new(),
+ }
+ }
+ async fn next(&mut self) -> Result<Option<Vec<u8>>, Error> {
+ while self.buf.len() < self.block_size {
+ if let Some(block) = self.body.next().await {
+ let bytes = block?;
+ self.buf.extend(&bytes[..]);
+ } else {
+ break;
+ }
+ }
+ if self.buf.len() == 0 {
+ Ok(None)
+ } else if self.buf.len() <= self.block_size {
+ let block = self.buf.drain(..)
+ .collect::<Vec<u8>>();
+ Ok(Some(block))
+ } else {
+ let block = self.buf.drain(..self.block_size)
+ .collect::<Vec<u8>>();
+ Ok(Some(block))
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:24:41 +0000