Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

use netapp streaming body #343

Merged
lx merged 31 commits from netapp-stream-body into main 2022-09-13 13:26:09 +00:00
Conversation 1 Commits 31 Files changed 24 +1 -5
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 68087ee13d - Show all commits

5
src/api/s3/copy.rs
View file

@ -366,10 +366,7 @@ pub async fn handle_upload_part_copy(
// we need to insert that data as a new block. // we need to insert that data as a new block.
async move { async move {
if must_upload { if must_upload {
garage2 garage2.block_manager.rpc_put_block(final_hash, data).await
.block_manager
.rpc_put_block(final_hash, data.into())
.await
} else { } else {
Ok(()) Ok(())
} }

1
src/api/s3/get.rs
View file

@ -450,7 +450,6 @@ fn body_from_blocks_range(
let garage = garage.clone(); let garage = garage.clone();
async move { async move {
let data = garage.block_manager.rpc_get_block(&block.hash).await?; let data = garage.block_manager.rpc_get_block(&block.hash).await?;
let data = Bytes::from(data);
let start_in_block = if true_offset > begin { let start_in_block = if true_offset > begin {
0 0
} else { } else {