micropelago/garage
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Alex Auvolat 2020-07-08 17:34:37 +02:00
parent 64a6eda0d2
commit 44dba0e53c
9 changed files with 209 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/s3_delete.rs
View File

@ -28,12 +28,10 @@ async fn handle_delete_internal(
Some(o) => o, Some(o) => o,
}; };
let interesting_versions = object.versions().iter().filter(|v| { let interesting_versions = object.versions().iter().filter(|v| match v.state {
match v.state {
ObjectVersionState::Aborted => false, ObjectVersionState::Aborted => false,
ObjectVersionState::Complete(ObjectVersionData::DeleteMarker) => false, ObjectVersionState::Complete(ObjectVersionData::DeleteMarker) => false,
_ => true, _ => true,
}
}); });
let mut must_delete = None; let mut must_delete = None;

21
src/api/s3_get.rs
View File

@ -12,12 +12,19 @@ use garage_table::EmptyKey;
use garage_model::garage::Garage; use garage_model::garage::Garage;
use garage_model::object_table::*; use garage_model::object_table::*;
fn object_headers(version: &ObjectVersion, version_meta: &ObjectVersionMeta) -> http::response::Builder { fn object_headers(
version: &ObjectVersion,
version_meta: &ObjectVersionMeta,
) -> http::response::Builder {
let date = UNIX_EPOCH + Duration::from_millis(version.timestamp); let date = UNIX_EPOCH + Duration::from_millis(version.timestamp);
let date_str = httpdate::fmt_http_date(date); let date_str = httpdate::fmt_http_date(date);
Response::builder() Response::builder()
.header("Content-Type", version_meta.headers.content_type.to_string()) .header(
"Content-Type",
version_meta.headers.content_type.to_string(),
)
// TODO: other headers
.header("Content-Length", format!("{}", version_meta.size)) .header("Content-Length", format!("{}", version_meta.size))
.header("ETag", version_meta.etag.to_string()) .header("ETag", version_meta.etag.to_string())
.header("Last-Modified", date_str) .header("Last-Modified", date_str)
@ -113,7 +120,15 @@ pub async fn handle_get(
None => None, None => None,
}; };
if let Some(range) = range { if let Some(range) = range {
return handle_get_range(garage, last_v, last_v_data, last_v_meta, range.start, range.start + range.length).await; return handle_get_range(
garage,
last_v,
last_v_data,
last_v_meta,
range.start,
range.start + range.length,
)
.await;
} }
let resp_builder = object_headers(&last_v, last_v_meta).status(StatusCode::OK); let resp_builder = object_headers(&last_v, last_v_meta).status(StatusCode::OK);

8
src/api/s3_list.rs
View File

@ -75,8 +75,12 @@ pub async fn handle_list(
result_common_prefixes.insert(pfx.to_string()); result_common_prefixes.insert(pfx.to_string());
} else { } else {
let size = match &version.state { let size = match &version.state {
ObjectVersionState::Complete(ObjectVersionData::Inline(meta, _)) => meta.size, ObjectVersionState::Complete(ObjectVersionData::Inline(meta, _)) => {
ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, _)) => meta.size, meta.size
}
ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, _)) => {
meta.size
}
_ => unreachable!(), _ => unreachable!(),
}; };
let info = match result_keys.get(&object.key) { let info = match result_keys.get(&object.key) {

49
src/api/s3_put.rs
View File

@ -1,4 +1,4 @@
use std::collections::{VecDeque, BTreeMap}; use std::collections::{BTreeMap, VecDeque};
use std::fmt::Write; use std::fmt::Write;
use std::sync::Arc; use std::sync::Arc;
@ -24,7 +24,7 @@ pub async fn handle_put(
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let version_uuid = gen_uuid(); let version_uuid = gen_uuid();
let headers = ObjectVersionHeaders{ let headers = ObjectVersionHeaders {
content_type: get_mime_type(&req)?, content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO other: BTreeMap::new(), // TODO
}; };
@ -45,12 +45,13 @@ pub async fn handle_put(
if first_block.len() < INLINE_THRESHOLD { if first_block.len() < INLINE_THRESHOLD {
object_version.state = ObjectVersionState::Complete(ObjectVersionData::Inline( object_version.state = ObjectVersionState::Complete(ObjectVersionData::Inline(
ObjectVersionMeta{ ObjectVersionMeta {
headers, headers,
size: first_block.len() as u64, size: first_block.len() as u64,
etag: "".to_string(), // TODO etag: "".to_string(), // TODO
}, },
first_block)); first_block,
));
let object = Object::new(bucket.into(), key.into(), vec![object_version]); let object = Object::new(bucket.into(), key.into(), vec![object_version]);
garage.object_table.insert(&object).await?; garage.object_table.insert(&object).await?;
@ -76,12 +77,13 @@ pub async fn handle_put(
// TODO: if at any step we have an error, we should undo everything we did // TODO: if at any step we have an error, we should undo everything we did
object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock( object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
ObjectVersionMeta{ ObjectVersionMeta {
headers, headers,
size: total_size, size: total_size,
etag: "".to_string(), // TODO etag: "".to_string(), // TODO
}, },
first_block_hash)); first_block_hash,
));
let object = Object::new(bucket.into(), key.into(), vec![object_version]); let object = Object::new(bucket.into(), key.into(), vec![object_version]);
garage.object_table.insert(&object).await?; garage.object_table.insert(&object).await?;
@ -219,7 +221,7 @@ pub async fn handle_create_multipart_upload(
key: &str, key: &str,
) -> Result<Response<Body>, Error> { ) -> Result<Response<Body>, Error> {
let version_uuid = gen_uuid(); let version_uuid = gen_uuid();
let headers = ObjectVersionHeaders{ let headers = ObjectVersionHeaders {
content_type: get_mime_type(&req)?, content_type: get_mime_type(&req)?,
other: BTreeMap::new(), // TODO other: BTreeMap::new(), // TODO
}; };
@ -286,9 +288,11 @@ pub async fn handle_put_part(
None => return Err(Error::BadRequest(format!("Object not found"))), None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x, Some(x) => x,
}; };
if !object.versions().iter().any(|v| { if !object
v.uuid == version_uuid && v.is_uploading() .versions()
}) { .iter()
.any(|v| v.uuid == version_uuid && v.is_uploading())
{
return Err(Error::BadRequest(format!( return Err(Error::BadRequest(format!(
"Multipart upload does not exist or is otherwise invalid" "Multipart upload does not exist or is otherwise invalid"
))); )));
@ -330,9 +334,10 @@ pub async fn handle_complete_multipart_upload(
None => return Err(Error::BadRequest(format!("Object not found"))), None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x, Some(x) => x,
}; };
let object_version = object.versions().iter().find(|v| { let object_version = object
v.uuid == version_uuid && v.is_uploading() .versions()
}); .iter()
.find(|v| v.uuid == version_uuid && v.is_uploading());
let mut object_version = match object_version { let mut object_version = match object_version {
None => { None => {
return Err(Error::BadRequest(format!( return Err(Error::BadRequest(format!(
@ -361,15 +366,14 @@ pub async fn handle_complete_multipart_upload(
.iter() .iter()
.map(|x| x.size) .map(|x| x.size)
.fold(0, |x, y| x + y); .fold(0, |x, y| x + y);
object_version.state = ObjectVersionState::Complete( object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
ObjectVersionData::FirstBlock( ObjectVersionMeta {
ObjectVersionMeta{
headers, headers,
size: total_size, size: total_size,
etag: "".to_string(),// TODO etag: "".to_string(), // TODO
}, },
version.blocks()[0].hash) version.blocks()[0].hash,
); ));
let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]); let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]);
garage.object_table.insert(&final_object).await?; garage.object_table.insert(&final_object).await?;
@ -411,9 +415,10 @@ pub async fn handle_abort_multipart_upload(
None => return Err(Error::BadRequest(format!("Object not found"))), None => return Err(Error::BadRequest(format!("Object not found"))),
Some(x) => x, Some(x) => x,
}; };
let object_version = object.versions().iter().find(|v| { let object_version = object
v.uuid == version_uuid && v.is_uploading() .versions()
}); .iter()
.find(|v| v.uuid == version_uuid && v.is_uploading());
let mut object_version = match object_version { let mut object_version = match object_version {
None => { None => {
return Err(Error::BadRequest(format!( return Err(Error::BadRequest(format!(

39
src/model/object_table.rs
View File

@ -1,7 +1,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::sync::Arc;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::sync::Arc;
use garage_util::background::BackgroundRunner; use garage_util::background::BackgroundRunner;
use garage_util::data::*; use garage_util::data::*;
@ -79,17 +79,15 @@ impl ObjectVersionState {
Aborted => { Aborted => {
*self = Aborted; *self = Aborted;
} }
Complete(b) => { Complete(b) => match self {
match self { Aborted => {}
Aborted => {},
Complete(a) => { Complete(a) => {
a.merge(b); a.merge(b);
} }
Uploading(_) => { Uploading(_) => {
*self = Complete(b.clone()); *self = Complete(b.clone());
} }
} },
}
Uploading(_) => {} Uploading(_) => {}
} }
} }
@ -118,7 +116,10 @@ pub struct ObjectVersionHeaders {
impl ObjectVersionData { impl ObjectVersionData {
fn merge(&mut self, b: &Self) { fn merge(&mut self, b: &Self) {
if *self != *b { if *self != *b {
warn!("Inconsistent object version data: {:?} (local) vs {:?} (remote)", self, b); warn!(
"Inconsistent object version data: {:?} (local) vs {:?} (remote)",
self, b
);
} }
} }
} }
@ -236,7 +237,9 @@ impl TableSchema for ObjectTable {
Ok(x) => x, Ok(x) => x,
Err(_) => return None, Err(_) => return None,
}; };
let new_v = old.versions().iter() let new_v = old
.versions()
.iter()
.map(migrate_version) .map(migrate_version)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let new = Object::new(old.bucket.clone(), old.key.clone(), new_v); let new = Object::new(old.bucket.clone(), old.key.clone(), new_v);
@ -245,11 +248,11 @@ impl TableSchema for ObjectTable {
} }
fn migrate_version(old: &prev::ObjectVersion) -> ObjectVersion { fn migrate_version(old: &prev::ObjectVersion) -> ObjectVersion {
let headers = ObjectVersionHeaders{ let headers = ObjectVersionHeaders {
content_type: old.mime_type.clone(), content_type: old.mime_type.clone(),
other: BTreeMap::new(), other: BTreeMap::new(),
}; };
let meta = ObjectVersionMeta{ let meta = ObjectVersionMeta {
headers: headers.clone(), headers: headers.clone(),
size: old.size, size: old.size,
etag: "".to_string(), etag: "".to_string(),
@ -257,22 +260,24 @@ fn migrate_version(old: &prev::ObjectVersion) -> ObjectVersion {
let state = match old.state { let state = match old.state {
prev::ObjectVersionState::Uploading => ObjectVersionState::Uploading(headers), prev::ObjectVersionState::Uploading => ObjectVersionState::Uploading(headers),
prev::ObjectVersionState::Aborted => ObjectVersionState::Aborted, prev::ObjectVersionState::Aborted => ObjectVersionState::Aborted,
prev::ObjectVersionState::Complete => { prev::ObjectVersionState::Complete => match &old.data {
match &old.data {
prev::ObjectVersionData::Uploading => ObjectVersionState::Uploading(headers), prev::ObjectVersionData::Uploading => ObjectVersionState::Uploading(headers),
prev::ObjectVersionData::DeleteMarker => ObjectVersionState::Complete(ObjectVersionData::DeleteMarker), prev::ObjectVersionData::DeleteMarker => {
prev::ObjectVersionData::Inline(x) => ObjectVersionState::Complete(ObjectVersionData::Inline(meta, x.clone())), ObjectVersionState::Complete(ObjectVersionData::DeleteMarker)
}
prev::ObjectVersionData::Inline(x) => {
ObjectVersionState::Complete(ObjectVersionData::Inline(meta, x.clone()))
}
prev::ObjectVersionData::FirstBlock(h) => { prev::ObjectVersionData::FirstBlock(h) => {
let mut hash = [0u8; 32]; let mut hash = [0u8; 32];
hash.copy_from_slice(h.as_ref()); hash.copy_from_slice(h.as_ref());
ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, Hash::from(hash))) ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, Hash::from(hash)))
} }
} },
}
}; };
let mut uuid = [0u8; 32]; let mut uuid = [0u8; 32];
uuid.copy_from_slice(old.uuid.as_ref()); uuid.copy_from_slice(old.uuid.as_ref());
ObjectVersion{ ObjectVersion {
uuid: UUID::from(uuid), uuid: UUID::from(uuid),
timestamp: old.timestamp, timestamp: old.timestamp,
state, state,

2
src/table/lib.rs
View File

@ -9,5 +9,5 @@ pub mod table_fullcopy;
pub mod table_sharded; pub mod table_sharded;
pub mod table_sync; pub mod table_sync;
pub use table::*;
pub use schema::*; pub use schema::*;
pub use table::*;

1
src/table/schema.rs
View File

@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
use garage_util::data::*; use garage_util::data::*;
use garage_util::error::Error; use garage_util::error::Error;
pub trait PartitionKey { pub trait PartitionKey {
fn hash(&self) -> Hash; fn hash(&self) -> Hash;
} }

9
src/table/table.rs
View File

@ -14,8 +14,8 @@ use garage_rpc::membership::{Ring, System};
use garage_rpc::rpc_client::*; use garage_rpc::rpc_client::*;
use garage_rpc::rpc_server::*; use garage_rpc::rpc_server::*;
use crate::table_sync::*;
use crate::schema::*; use crate::schema::*;
use crate::table_sync::*;
const TABLE_RPC_TIMEOUT: Duration = Duration::from_secs(10); const TABLE_RPC_TIMEOUT: Duration = Duration::from_secs(10);
@ -48,7 +48,6 @@ pub enum TableRPC<F: TableSchema> {
impl<F: TableSchema> RpcMessage for TableRPC<F> {} impl<F: TableSchema> RpcMessage for TableRPC<F> {}
pub trait TableReplication: Send + Sync { pub trait TableReplication: Send + Sync {
// See examples in table_sharded.rs and table_fullcopy.rs // See examples in table_sharded.rs and table_fullcopy.rs
// To understand various replication methods // To understand various replication methods
@ -459,12 +458,10 @@ where
fn decode_entry(bytes: &[u8]) -> Result<F::E, Error> { fn decode_entry(bytes: &[u8]) -> Result<F::E, Error> {
match rmp_serde::decode::from_read_ref::<_, F::E>(bytes) { match rmp_serde::decode::from_read_ref::<_, F::E>(bytes) {
Ok(x) => Ok(x), Ok(x) => Ok(x),
Err(e) => { Err(e) => match F::try_migrate(bytes) {
match F::try_migrate(bytes) {
Some(x) => Ok(x), Some(x) => Ok(x),
None => Err(e.into()), None => Err(e.into()),
} },
}
} }
} }
} }