forked from Deuxfleurs/garage
Merge branch 'master' into feature/website
This commit is contained in:
commit
15f409d404
5 changed files with 44 additions and 13 deletions
7
script/dev-clean.sh
Executable file
7
script/dev-clean.sh
Executable file
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
killall -9 garage || echo "garage is not running"
|
||||
rm -rf /tmp/garage*
|
||||
rm -rf /tmp/config.*.toml
|
|
@ -6,6 +6,11 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
|
|||
GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
|
||||
PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
|
||||
|
||||
until garage status 2>&1|grep -q Healthy ; do
|
||||
echo "cluster starting..."
|
||||
sleep 1
|
||||
done
|
||||
|
||||
garage status \
|
||||
| grep UNCONFIGURED \
|
||||
| grep -Po '^[0-9a-f]+' \
|
||||
|
|
|
@ -12,4 +12,3 @@ export AWS_DEFAULT_REGION='garage'
|
|||
|
||||
alias s3grg="aws s3 \
|
||||
--endpoint-url http://127.0.0.1:3900"
|
||||
|
||||
|
|
22
script/test-smoke.sh
Executable file
22
script/test-smoke.sh
Executable file
|
@ -0,0 +1,22 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
shopt -s expand_aliases
|
||||
|
||||
SCRIPT_FOLDER="`dirname \"$0\"`"
|
||||
REPO_FOLDER="${SCRIPT_FOLDER}/../"
|
||||
|
||||
cargo build
|
||||
${SCRIPT_FOLDER}/dev-clean.sh
|
||||
${SCRIPT_FOLDER}/dev-cluster.sh > /tmp/garage.log 2>&1 &
|
||||
${SCRIPT_FOLDER}/dev-configure.sh
|
||||
${SCRIPT_FOLDER}/dev-bucket.sh
|
||||
source ${SCRIPT_FOLDER}/dev-env.sh
|
||||
|
||||
dd if=/dev/urandom of=/tmp/garage.rnd bs=1M count=10
|
||||
|
||||
s3grg put /tmp/garage.rnd s3://eprouvette/
|
||||
s3grg ls s3://eprouvette
|
||||
s3grg get s3://eprouvette/garage.rnd /tmp/garage.dl
|
||||
|
||||
diff /tmp/garage.rnd /tmp/garage.dl
|
|
@ -51,12 +51,7 @@ pub async fn handle_put(
|
|||
let md5sum_arr = md5sum.finalize();
|
||||
let md5sum_hex = hex::encode(md5sum_arr);
|
||||
|
||||
let mut sha256sum = Sha256::new();
|
||||
sha256sum.input(&first_block[..]);
|
||||
let sha256sum_arr = sha256sum.result();
|
||||
let mut hash = [0u8; 32];
|
||||
hash.copy_from_slice(&sha256sum_arr[..]);
|
||||
let sha256sum_hash = Hash::from(hash);
|
||||
let sha256sum_hash = hash(&first_block[..]);
|
||||
|
||||
ensure_checksum_matches(
|
||||
md5sum_arr.as_slice(),
|
||||
|
@ -253,7 +248,7 @@ impl BodyChunker {
|
|||
body,
|
||||
read_all: false,
|
||||
block_size,
|
||||
buf: VecDeque::new(),
|
||||
buf: VecDeque::with_capacity(2 * block_size),
|
||||
}
|
||||
}
|
||||
async fn next(&mut self) -> Result<Option<Vec<u8>>, GarageError> {
|
||||
|
@ -278,11 +273,10 @@ impl BodyChunker {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn put_response(version_uuid: UUID, etag: String) -> Response<Body> {
|
||||
pub fn put_response(version_uuid: UUID, md5sum_hex: String) -> Response<Body> {
|
||||
Response::builder()
|
||||
.header("x-amz-version-id", hex::encode(version_uuid))
|
||||
.header("ETag", etag)
|
||||
// TODO ETag
|
||||
.header("ETag", format!("\"{}\"", md5sum_hex))
|
||||
.body(Body::from(vec![]))
|
||||
.unwrap()
|
||||
}
|
||||
|
@ -369,7 +363,7 @@ pub async fn handle_put_part(
|
|||
}
|
||||
|
||||
// Copy block to store
|
||||
let version = Version::new(version_uuid, bucket.into(), key.into(), false, vec![]);
|
||||
let version = Version::new(version_uuid, bucket, key, false, vec![]);
|
||||
let first_block_hash = hash(&first_block[..]);
|
||||
let (_, md5sum_arr, sha256sum) = read_and_put_blocks(
|
||||
&garage,
|
||||
|
@ -388,7 +382,11 @@ pub async fn handle_put_part(
|
|||
content_sha256,
|
||||
)?;
|
||||
|
||||
Ok(Response::new(Body::from(vec![])))
|
||||
let response = Response::builder()
|
||||
.header("ETag", format!("\"{}\"", hex::encode(md5sum_arr)))
|
||||
.body(Body::from(vec![]))
|
||||
.unwrap();
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
pub async fn handle_complete_multipart_upload(
|
||||
|
|
Loading…
Reference in a new issue