From 601ae25ad27d99c524691d5284e56b2e61545979 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 16:21:28 +0100 Subject: Small refactorings --- src/api/s3_put.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index a528720d..6906d758 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -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(), @@ -282,7 +277,6 @@ pub fn put_response(version_uuid: UUID, etag: String) -> Response { Response::builder() .header("x-amz-version-id", hex::encode(version_uuid)) .header("ETag", etag) - // TODO ETag .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, -- cgit v1.2.3 From fed97f37e1f0cc2ed8e06f4b76ed0cfcf4a24c97 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 16:38:01 +0100 Subject: ETag patch --- src/api/s3_put.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index 6906d758..09c3cdbe 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -273,10 +273,10 @@ impl BodyChunker { } } -pub fn put_response(version_uuid: UUID, etag: String) -> Response { +pub fn put_response(version_uuid: UUID, md5sum_hex: String) -> Response { Response::builder() .header("x-amz-version-id", hex::encode(version_uuid)) - .header("ETag", etag) + .header("ETag", format!("\"{}\"", md5sum_hex)) .body(Body::from(vec![])) .unwrap() } @@ -382,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( -- cgit v1.2.3 From 07e87595f8c12a6e60c90b3eb11ab89d7f719420 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 29 Nov 2020 16:48:49 +0100 Subject: S3 does not support accentuated buckets + add a script to clean tmp --- script/dev-bucket.sh | 6 +++--- script/dev-clean.sh | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100755 script/dev-clean.sh diff --git a/script/dev-bucket.sh b/script/dev-bucket.sh index f07263f5..8c0ef4e4 100755 --- a/script/dev-bucket.sh +++ b/script/dev-bucket.sh @@ -6,11 +6,11 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" -garage bucket create éprouvette +garage bucket create eprouvette KEY_INFO=`garage key new --name opérateur` ACCESS_KEY=`echo $KEY_INFO|grep -Po 'GK[a-f0-9]+'` SECRET_KEY=`echo $KEY_INFO|grep -Po 'secret_key: "[a-f0-9]+'|grep -Po '[a-f0-9]+$'` -garage bucket allow éprouvette --read --write --key $ACCESS_KEY +garage bucket allow eprouvette --read --write --key $ACCESS_KEY echo "$ACCESS_KEY $SECRET_KEY" > /tmp/garage.s3 -echo "Bucket s3://éprouvette created. Credentials stored in /tmp/garage.s3." +echo "Bucket s3://eprouvette created. Credentials stored in /tmp/garage.s3." diff --git a/script/dev-clean.sh b/script/dev-clean.sh new file mode 100755 index 00000000..151c5547 --- /dev/null +++ b/script/dev-clean.sh @@ -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 -- cgit v1.2.3 From 3f18aa6f1def52d61a4fc3bbb667d1f0911665ed Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 29 Nov 2020 17:03:08 +0100 Subject: Add a smoke test script --- script/dev-cluster.sh | 2 +- script/dev-configure.sh | 5 +++++ script/test-smoke.sh | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100755 script/test-smoke.sh diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh index cfe9be0d..2826d226 100755 --- a/script/dev-cluster.sh +++ b/script/dev-cluster.sh @@ -10,7 +10,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m") export RUST_BACKTRACE=1 -export RUST_LOG=garage=info +export RUST_LOG=garage=trace MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m" WHICH_GARAGE=$(which garage || exit 1) diff --git a/script/dev-configure.sh b/script/dev-configure.sh index 8b7392c6..698c7ed9 100755 --- a/script/dev-configure.sh +++ b/script/dev-configure.sh @@ -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]+' \ diff --git a/script/test-smoke.sh b/script/test-smoke.sh new file mode 100755 index 00000000..7b462b00 --- /dev/null +++ b/script/test-smoke.sh @@ -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 -- cgit v1.2.3 From d54f15b2c6794eacee82d3900c50dbfb086f8c79 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 17:06:55 +0100 Subject: Small optimisation --- src/api/s3_put.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index 09c3cdbe..9c4d625c 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -248,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>, GarageError> { -- cgit v1.2.3 From 13d1b66ba40bd533e53484f24dde6decbec6512e Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 29 Nov 2020 17:07:12 +0100 Subject: Rollback logging on dev-cluster --- script/dev-cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh index 2826d226..cfe9be0d 100755 --- a/script/dev-cluster.sh +++ b/script/dev-cluster.sh @@ -10,7 +10,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m") export RUST_BACKTRACE=1 -export RUST_LOG=garage=trace +export RUST_LOG=garage=info MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m" WHICH_GARAGE=$(which garage || exit 1) -- cgit v1.2.3 From cee6c3a821fb2ef0f5254f9ad1c0e47dd47047d4 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 29 Nov 2020 17:15:49 +0100 Subject: A fix for s3cmd --- script/dev-env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/dev-env.sh b/script/dev-env.sh index 7e8ffc50..f5e71004 100755 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -11,6 +11,7 @@ SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` alias s3grg="s3cmd \ --host 127.0.0.1:3900 \ + --host-bucket 127.0.0.1:3900 \ --access_key=$ACCESS_KEY \ --secret_key=$SECRET_KEY \ --region=garage \ -- cgit v1.2.3 From 2f11191f607eb70b608358576303d7e94e757038 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 29 Nov 2020 17:31:58 +0100 Subject: Use ipv6 localhost for dev cluster and different port numbers --- script/dev-cluster.sh | 12 ++++++------ script/dev-env.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh index cfe9be0d..101a18bd 100755 --- a/script/dev-cluster.sh +++ b/script/dev-cluster.sh @@ -24,11 +24,11 @@ cat > $CONF_PATH < + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + diff --git a/doc/20201202_talk/img/consistent_hashing_2.svg b/doc/20201202_talk/img/consistent_hashing_2.svg new file mode 100644 index 00000000..5ac8faf6 --- /dev/null +++ b/doc/20201202_talk/img/consistent_hashing_2.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + + + diff --git a/doc/20201202_talk/img/consistent_hashing_3.svg b/doc/20201202_talk/img/consistent_hashing_3.svg new file mode 100644 index 00000000..fdfd3efc --- /dev/null +++ b/doc/20201202_talk/img/consistent_hashing_3.svg @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + + + + + diff --git a/doc/20201202_talk/img/consistent_hashing_4.svg b/doc/20201202_talk/img/consistent_hashing_4.svg new file mode 100644 index 00000000..95ed0e02 --- /dev/null +++ b/doc/20201202_talk/img/consistent_hashing_4.svg @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + 1 + + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + + + + + + + + + + + + + + + + + diff --git a/doc/20201202_talk/img/garage_distributed.svg b/doc/20201202_talk/img/garage_distributed.svg new file mode 100644 index 00000000..2db03626 --- /dev/null +++ b/doc/20201202_talk/img/garage_distributed.svg @@ -0,0 +1,404 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/20201202_talk/talk.pdf b/doc/20201202_talk/talk.pdf index a0bbe130..c31a1d9a 100644 Binary files a/doc/20201202_talk/talk.pdf and b/doc/20201202_talk/talk.pdf differ diff --git a/doc/20201202_talk/talk.tex b/doc/20201202_talk/talk.tex index c3e9f625..4b8e76c3 100644 --- a/doc/20201202_talk/talk.tex +++ b/doc/20201202_talk/talk.tex @@ -42,7 +42,7 @@ \begin{document} \begin{frame} -\titlepage + \titlepage \end{frame} \begin{frame} @@ -58,82 +58,135 @@ \begin{frame}[t] \frametitle{La cour des grands} -\begin{columns}[t] -\begin{column}{0.5\textwidth} - {\huge Le modèle du cloud...} - -\begin{center} - \includegraphics[scale=0.08]{img/cloud.png} -\end{center} - - + \underline{intégrité} : plus de perte de données - - + \underline{disponibilité} : tout le temps accessible + \begin{columns}[t] + \begin{column}{0.5\textwidth} + {\huge Le modèle du cloud...} + + \begin{center} + \includegraphics[scale=0.08]{img/cloud.png} + \end{center} - + \underline{service} : rien à gérer - - \vspace{0.15cm} - \textbf{changement des comportements} -\end{column} -\pause -\begin{column}{0.5\textwidth} - {\huge ...et son prix} - -\begin{center} - \includegraphics[scale=0.07]{img/dc.jpg} -\end{center} - - - matériel couteux et polluant - - - logiciels secrets - - - gestion opaque - - \vspace{0.2cm} - \textbf{prisonnier de l'écosystème} -\end{column} -\end{columns} + + \underline{intégrité} : plus de perte de données + + + \underline{disponibilité} : tout le temps accessible + + + \underline{service} : rien à gérer + + \vspace{0.15cm} + \textbf{changement des comportements} + \end{column} + \pause + \begin{column}{0.5\textwidth} + {\huge ...et son prix} + + \begin{center} + \includegraphics[scale=0.07]{img/dc.jpg} + \end{center} + + - matériel couteux et polluant + + - logiciels secrets + + - gestion opaque + + \vspace{0.2cm} + \textbf{prisonnier de l'écosystème} + \end{column} + \end{columns} \end{frame} \begin{frame}[t] \frametitle{Garage l'imposteur} -\begin{columns}[t] -\begin{column}{0.5\textwidth} - {\huge Ressemble à du cloud...} - -\begin{center} - \includegraphics[scale=0.5]{img/shh.jpg} -\end{center} - -+ \underline{compatible} avec les apps existantes - -+ \underline{fonctionne} avec le mobile - -+ \underline{s'adapte} aux habitudes prises - - -\end{column} - -\pause -\begin{column}{0.5\textwidth} - {\huge ...fait du P2P} - -\begin{center} - \includegraphics[scale=1]{img/death.jpg} -\end{center} + \begin{columns}[t] + \begin{column}{0.5\textwidth} + {\huge Ressemble à du cloud...} + + \begin{center} + \includegraphics[scale=0.5]{img/shh.jpg} + \end{center} + + + \underline{compatible} avec les apps existantes + + + \underline{fonctionne} avec le mobile + + + \underline{s'adapte} aux habitudes prises + + + \end{column} + + \pause + \begin{column}{0.5\textwidth} + {\huge ...fait du P2P} + + \begin{center} + \includegraphics[scale=1]{img/death.jpg} + \end{center} + + \vspace{0.4cm} + + + \underline{contrôle} de l'infrastructure + + + \underline{transparent} code libre + + + \underline{sobre} fonctionne avec de vieilles machines à la maison + \end{column} + \end{columns} -\vspace{0.4cm} +\end{frame} -+ \underline{contrôle} de l'infrastructure -+ \underline{transparent} code libre +\graphicspath{{img/}} -+ \underline{sobre} fonctionne avec de vieilles machines à la maison -\end{column} -\end{columns} +\begin{frame} + \frametitle{Mais donc, c'est quoi Garage ?} + + \begin{columns}[t] + \begin{column}{0.5\textwidth} + \centering + \textbf{Un système de stockage distribué} + \vspace{1em} + + \def\svgwidth{.7\columnwidth} + \input{img/garage_distributed.pdf_tex} + \end{column} + \pause + + \begin{column}{0.5\textwidth} + \centering + \textbf{qui implémente l'API S3} + \vspace{2em} + + \includegraphics[width=.7\columnwidth]{img/Amazon-S3.jpg} + \end{column} + \end{columns} +\end{frame} +\begin{frame} + \frametitle{Consistent Hashing (DynamoDB)} + \textbf{Comment répartir les fichiers sur les différentes machines ?} + \vspace{1em} + + \centering + + \only<1>{ + \def\svgwidth{.55\columnwidth} + \input{img/consistent_hashing_1.pdf_tex} + } + \only<2>{ + \def\svgwidth{.55\columnwidth} + \input{img/consistent_hashing_2.pdf_tex} + } + \only<3>{ + \def\svgwidth{.55\columnwidth} + \input{img/consistent_hashing_3.pdf_tex} + } + \only<4>{ + \def\svgwidth{.55\columnwidth} + \input{img/consistent_hashing_4.pdf_tex} + } \end{frame} + \end{document} %% vim: set ts=4 sw=4 tw=0 noet spelllang=fr : -- cgit v1.2.3 From 7642229d54fa6d94566dd06fcfdcaf1728880bdd Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 1 Dec 2020 14:31:13 +0100 Subject: Two new slides --- doc/20201202_talk/Makefile | 4 +- doc/20201202_talk/img/garage_tables.svg | 502 +++++++++++++++++++++++++ doc/20201202_talk/img/rustacean-flat-happy.png | Bin 0 -> 33061 bytes doc/20201202_talk/talk.pdf | Bin 744425 -> 801650 bytes doc/20201202_talk/talk.tex | 65 +++- 5 files changed, 559 insertions(+), 12 deletions(-) create mode 100644 doc/20201202_talk/img/garage_tables.svg create mode 100644 doc/20201202_talk/img/rustacean-flat-happy.png diff --git a/doc/20201202_talk/Makefile b/doc/20201202_talk/Makefile index 2bf9f2ac..27dbf788 100644 --- a/doc/20201202_talk/Makefile +++ b/doc/20201202_talk/Makefile @@ -1,6 +1,6 @@ -talk.pdf: talk.tex img/garage_distributed.pdf img/consistent_hashing_1.pdf img/consistent_hashing_2.pdf img/consistent_hashing_3.pdf img/consistent_hashing_4.pdf +talk.pdf: talk.tex img/garage_distributed.pdf img/consistent_hashing_1.pdf img/consistent_hashing_2.pdf img/consistent_hashing_3.pdf img/consistent_hashing_4.pdf img/garage_tables.pdf pdflatex talk.tex img/%.pdf: img/%.svg - inkscape -D -z --file=$^ --export-pdf=$@ --export-latex + inkscape -D -z --file=$^ --export-pdf=$@ diff --git a/doc/20201202_talk/img/garage_tables.svg b/doc/20201202_talk/img/garage_tables.svg new file mode 100644 index 00000000..fc3d8fc5 --- /dev/null +++ b/doc/20201202_talk/img/garage_tables.svg @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + Object + + + + + + bucket + + + + + + file path + + + + + + Version 1 + deleted + + + + + + + Version 2 + id + + size + MIME type + ... + + + + + + Version + + id + h(block 1) + h(block 2) + ... + + + + + Data block + + hash + data + + + + Objects table + Versions table + Blocks table + + diff --git a/doc/20201202_talk/img/rustacean-flat-happy.png b/doc/20201202_talk/img/rustacean-flat-happy.png new file mode 100644 index 00000000..ebce1a14 Binary files /dev/null and b/doc/20201202_talk/img/rustacean-flat-happy.png differ diff --git a/doc/20201202_talk/talk.pdf b/doc/20201202_talk/talk.pdf index c31a1d9a..a6280903 100644 Binary files a/doc/20201202_talk/talk.pdf and b/doc/20201202_talk/talk.pdf differ diff --git a/doc/20201202_talk/talk.tex b/doc/20201202_talk/talk.tex index 4b8e76c3..c9aecba2 100644 --- a/doc/20201202_talk/talk.tex +++ b/doc/20201202_talk/talk.tex @@ -147,8 +147,7 @@ \textbf{Un système de stockage distribué} \vspace{1em} - \def\svgwidth{.7\columnwidth} - \input{img/garage_distributed.pdf_tex} + \includegraphics[width=.7\columnwidth]{img/garage_distributed.pdf} \end{column} \pause @@ -170,23 +169,69 @@ \centering \only<1>{ - \def\svgwidth{.55\columnwidth} - \input{img/consistent_hashing_1.pdf_tex} + \includegraphics[width=.55\columnwidth]{img/consistent_hashing_1.pdf} } \only<2>{ - \def\svgwidth{.55\columnwidth} - \input{img/consistent_hashing_2.pdf_tex} + \includegraphics[width=.55\columnwidth]{img/consistent_hashing_2.pdf} } \only<3>{ - \def\svgwidth{.55\columnwidth} - \input{img/consistent_hashing_3.pdf_tex} + \includegraphics[width=.55\columnwidth]{img/consistent_hashing_3.pdf} } \only<4>{ - \def\svgwidth{.55\columnwidth} - \input{img/consistent_hashing_4.pdf_tex} + \includegraphics[width=.55\columnwidth]{img/consistent_hashing_4.pdf} } \end{frame} +\begin{frame} + \frametitle{Garage Internals : 3 niveaux de consistent hashing} + \centering + \includegraphics[width=.85\columnwidth]{img/garage_tables.pdf} +\end{frame} + +\begin{frame} + \frametitle{Rust : retour d'expérience} + + Garage est entièrement écrit en Rust ! + + \begin{columns} + \begin{column}{0.5\textwidth} + \vspace{2em} + + \textbf{Points forts :} + \vspace{.5em} + \begin{itemize} + \item Langage compilé, très rapide + \vspace{.5em} + \item Typage fort, beaucoup de sécurités + \vspace{.5em} + \item Le meilleur de plusieurs paradigmes: + fonctionnel, orienté objet, impératif + \vspace{.5em} + \item Un écosytème de librairies très complet: + serialisation, async/await, http, ... + \vspace{.5em} + \end{itemize} + + \end{column} + + \begin{column}{0.5\textwidth} + \begin{centering} + \includegraphics[width=0.55\columnwidth]{img/rustacean-flat-happy.png} + \end{centering} + + \vspace{1em} + \textbf{Points faibles :} + \vspace{.5em} + \begin{itemize} + \item Les temps de compilation... + \vspace{.5em} + \item Compliqué à apprendre + \end{itemize} + \end{column} + \end{columns} + +\end{frame} + \end{document} %% vim: set ts=4 sw=4 tw=0 noet spelllang=fr : -- cgit v1.2.3 From f844d4ee9b37a3d65a69e8dbd52e792704edf39e Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 1 Dec 2020 17:42:13 +0100 Subject: Add slide on consistency --- doc/20201202_talk/talk.pdf | Bin 801650 -> 815667 bytes doc/20201202_talk/talk.tex | 50 +++++++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/doc/20201202_talk/talk.pdf b/doc/20201202_talk/talk.pdf index a6280903..b27eca29 100644 Binary files a/doc/20201202_talk/talk.pdf and b/doc/20201202_talk/talk.pdf differ diff --git a/doc/20201202_talk/talk.tex b/doc/20201202_talk/talk.tex index c9aecba2..1acda842 100644 --- a/doc/20201202_talk/talk.tex +++ b/doc/20201202_talk/talk.tex @@ -168,18 +168,10 @@ \centering - \only<1>{ - \includegraphics[width=.55\columnwidth]{img/consistent_hashing_1.pdf} - } - \only<2>{ - \includegraphics[width=.55\columnwidth]{img/consistent_hashing_2.pdf} - } - \only<3>{ - \includegraphics[width=.55\columnwidth]{img/consistent_hashing_3.pdf} - } - \only<4>{ - \includegraphics[width=.55\columnwidth]{img/consistent_hashing_4.pdf} - } + \only<1>{\includegraphics[width=.55\columnwidth]{img/consistent_hashing_1.pdf}}% + \only<2>{\includegraphics[width=.55\columnwidth]{img/consistent_hashing_2.pdf}}% + \only<3>{\includegraphics[width=.55\columnwidth]{img/consistent_hashing_3.pdf}}% + \only<4>{\includegraphics[width=.55\columnwidth]{img/consistent_hashing_4.pdf}}% \end{frame} \begin{frame} @@ -189,12 +181,31 @@ \end{frame} \begin{frame} - \frametitle{Rust : retour d'expérience} + \frametitle{Modèles de cohérence} + Garage utilise un modèle de cohérence relativement faible : + \vspace{1em} - Garage est entièrement écrit en Rust ! + \begin{itemize} + \item Objets répliqués 3 fois, quorum de 2 pour les lectures et les écritures\\ + $\to$ cohérence \textbf{``read your writes''} + \vspace{1em} + \item<2-> Types de donnée CRDT + mécanisme d'anti-entropie\\ + $\to$ cohérence \textbf{à terme} (eventual consistency) + \vspace{1em} + \item<3-> Cela s'applique pour chaque fichier individuellement :\\ + pas de linéarisabilté ou de cohérence causale entre les opérations\\ + sur des fichiers différents + \vspace{1em} + \item<4-> \textbf{Avantage :} convient bien à un déploiement géodistribué (multi-datacenter) + \end{itemize} +\end{frame} + +\begin{frame} + \frametitle{Rust : retour d'expérience} \begin{columns} - \begin{column}{0.5\textwidth} + \begin{column}{0.55\textwidth} + Garage est entièrement écrit en Rust ! \vspace{2em} \textbf{Points forts :} @@ -209,17 +220,15 @@ \vspace{.5em} \item Un écosytème de librairies très complet: serialisation, async/await, http, ... - \vspace{.5em} \end{itemize} - \end{column} - \begin{column}{0.5\textwidth} + \begin{column}{0.45\textwidth} \begin{centering} - \includegraphics[width=0.55\columnwidth]{img/rustacean-flat-happy.png} + \hspace{2em}\includegraphics[width=0.55\columnwidth]{img/rustacean-flat-happy.png} \end{centering} - \vspace{1em} + \vspace{2em} \textbf{Points faibles :} \vspace{.5em} \begin{itemize} @@ -227,6 +236,7 @@ \vspace{.5em} \item Compliqué à apprendre \end{itemize} + \vspace{2em} \end{column} \end{columns} -- cgit v1.2.3 From 9f46fb699a68c2d8b721b0b1d0e3419a830a4052 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 5 Dec 2020 16:37:59 +0100 Subject: Content-range fix --- src/api/s3_get.rs | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs index a68c485b..a5e7b342 100644 --- a/src/api/s3_get.rs +++ b/src/api/s3_get.rs @@ -161,7 +161,7 @@ pub async fn handle_get( } }) .buffered(2); - //let body: Body = Box::new(StreamBody::new(Box::pin(body_stream))); + let body = hyper::body::Body::wrap_stream(body_stream); Ok(resp_builder.body(body)?) } @@ -183,7 +183,7 @@ pub async fn handle_get_range( let resp_builder = object_headers(version, version_meta) .header( "Content-Range", - format!("bytes {}-{}/{}", begin, end, version_meta.size), + format!("bytes {}-{}/{}", begin, end - 1, version_meta.size), ) .status(StatusCode::PARTIAL_CONTENT); @@ -206,35 +206,49 @@ pub async fn handle_get_range( None => return Err(Error::NotFound), }; - let blocks = version - .blocks() - .iter() - .cloned() - .filter(|block| block.offset + block.size > begin && block.offset < end) - .collect::>(); + // We will store here the list of blocks that have an intersection with the requested + // range, as well as their "true offset", which is their actual offset in the complete + // file (whereas block.offset designates the offset of the block WITHIN THE PART + // block.part_number, which is not the same in the case of a multipart upload) + let mut blocks = Vec::with_capacity(std::cmp::min( + version.blocks().len(), + 4 + ((end - begin) / std::cmp::max(version.blocks()[0].size as u64, 1024)) as usize, + )); + let mut true_offset = 0; + for b in version.blocks().iter() { + if true_offset >= end { + break; + } + // Keep only blocks that have an intersection with the requested range + if true_offset < end && true_offset + b.size > begin { + blocks.push((b.clone(), true_offset)); + } + true_offset += b.size; + } let body_stream = futures::stream::iter(blocks) - .map(move |block| { + .map(move |(block, true_offset)| { let garage = garage.clone(); async move { let data = garage.block_manager.rpc_get_block(&block.hash).await?; - let start_in_block = if block.offset > begin { + let data = Bytes::from(data); + let start_in_block = if true_offset > begin { 0 } else { - begin - block.offset + begin - true_offset }; - let end_in_block = if block.offset + block.size < end { + let end_in_block = if true_offset + block.size < end { block.size } else { - end - block.offset + end - true_offset }; Result::::Ok(Bytes::from( - data[start_in_block as usize..end_in_block as usize].to_vec(), + data.slice(start_in_block as usize..end_in_block as usize), )) } }) .buffered(2); - //let body: Body = Box::new(StreamBody::new(Box::pin(body_stream))); + let body = hyper::body::Body::wrap_stream(body_stream); Ok(resp_builder.body(body)?) } -- cgit v1.2.3 From bd7e3d1bd1c4df4f2848e0f8c49878dacb330b50 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 5 Dec 2020 18:57:22 +0100 Subject: Fix Content-Length --- src/api/s3_get.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs index a5e7b342..a52222a0 100644 --- a/src/api/s3_get.rs +++ b/src/api/s3_get.rs @@ -15,6 +15,7 @@ use crate::error::*; fn object_headers( version: &ObjectVersion, version_meta: &ObjectVersionMeta, + partial_size: Option ) -> http::response::Builder { let date = UNIX_EPOCH + Duration::from_millis(version.timestamp); let date_str = httpdate::fmt_http_date(date); @@ -24,7 +25,7 @@ fn object_headers( "Content-Type", version_meta.headers.content_type.to_string(), ) - .header("Content-Length", format!("{}", version_meta.size)) + .header("Content-Length", format!("{}", partial_size.unwrap_or(version_meta.size))) .header("ETag", version_meta.etag.to_string()) .header("Last-Modified", date_str) .header("Accept-Ranges", format!("bytes")); @@ -62,7 +63,7 @@ pub async fn handle_head( }; let body: Body = Body::from(vec![]); - let response = object_headers(&version, version_meta) + let response = object_headers(&version, version_meta, None) .status(StatusCode::OK) .body(body) .unwrap(); @@ -123,7 +124,7 @@ pub async fn handle_get( .await; } - let resp_builder = object_headers(&last_v, last_v_meta).status(StatusCode::OK); + let resp_builder = object_headers(&last_v, last_v_meta, None).status(StatusCode::OK); match &last_v_data { ObjectVersionData::DeleteMarker => unreachable!(), @@ -180,7 +181,7 @@ pub async fn handle_get_range( return Err(Error::BadRequest(format!("Range not included in file"))); } - let resp_builder = object_headers(version, version_meta) + let resp_builder = object_headers(version, version_meta, Some(end - begin)) .header( "Content-Range", format!("bytes {}-{}/{}", begin, end - 1, version_meta.size), -- cgit v1.2.3 From 76b489f3d374c5a793929ce70654538d07268a6e Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 5 Dec 2020 19:20:07 +0100 Subject: Reformulate patch --- src/api/s3_get.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs index a52222a0..43215923 100644 --- a/src/api/s3_get.rs +++ b/src/api/s3_get.rs @@ -15,7 +15,6 @@ use crate::error::*; fn object_headers( version: &ObjectVersion, version_meta: &ObjectVersionMeta, - partial_size: Option ) -> http::response::Builder { let date = UNIX_EPOCH + Duration::from_millis(version.timestamp); let date_str = httpdate::fmt_http_date(date); @@ -25,7 +24,6 @@ fn object_headers( "Content-Type", version_meta.headers.content_type.to_string(), ) - .header("Content-Length", format!("{}", partial_size.unwrap_or(version_meta.size))) .header("ETag", version_meta.etag.to_string()) .header("Last-Modified", date_str) .header("Accept-Ranges", format!("bytes")); @@ -63,7 +61,8 @@ pub async fn handle_head( }; let body: Body = Body::from(vec![]); - let response = object_headers(&version, version_meta, None) + let response = object_headers(&version, version_meta) + .header("Content-Length", format!("{}", version_meta.size)) .status(StatusCode::OK) .body(body) .unwrap(); @@ -124,7 +123,9 @@ pub async fn handle_get( .await; } - let resp_builder = object_headers(&last_v, last_v_meta, None).status(StatusCode::OK); + let resp_builder = object_headers(&last_v, last_v_meta) + .header("Content-Length", format!("{}", last_v_meta.size)) + .status(StatusCode::OK); match &last_v_data { ObjectVersionData::DeleteMarker => unreachable!(), @@ -181,7 +182,8 @@ pub async fn handle_get_range( return Err(Error::BadRequest(format!("Range not included in file"))); } - let resp_builder = object_headers(version, version_meta, Some(end - begin)) + let resp_builder = object_headers(version, version_meta) + .header("Content-Length", format!("{}", end - begin)) .header( "Content-Range", format!("bytes {}-{}/{}", begin, end - 1, version_meta.size), -- cgit v1.2.3 From 4a5bbbb81088c9bd25bbe142f67daf4669b6538e Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 5 Dec 2020 19:23:46 +0100 Subject: Propose ETag fix --- Cargo.lock | 1 + src/api/Cargo.toml | 1 + src/api/s3_get.rs | 5 ++++- src/api/s3_put.rs | 17 ++++++++++++++++- src/table/table.rs | 3 ++- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7cf8b56..1d9525be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -461,6 +461,7 @@ dependencies = [ "log", "md-5", "percent-encoding", + "rand", "roxmltree", "sha2", "tokio", diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index a366f9b8..079993c3 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -27,6 +27,7 @@ md-5 = "0.9.1" sha2 = "0.8" hmac = "0.7" crypto-mac = "0.7" +rand = "0.7" futures = "0.3" futures-util = "0.3" diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs index 43215923..1a23f476 100644 --- a/src/api/s3_get.rs +++ b/src/api/s3_get.rs @@ -24,10 +24,13 @@ fn object_headers( "Content-Type", version_meta.headers.content_type.to_string(), ) - .header("ETag", version_meta.etag.to_string()) .header("Last-Modified", date_str) .header("Accept-Ranges", format!("bytes")); + if !version_meta.etag.is_empty() { + resp = resp.header("ETag", format!("\"{}\"", version_meta.etag)); + } + for (k, v) in version_meta.headers.other.iter() { resp = resp.header(k, v.to_string()); } diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs index 9c4d625c..c42309b2 100644 --- a/src/api/s3_put.rs +++ b/src/api/s3_put.rs @@ -428,6 +428,21 @@ pub async fn handle_complete_multipart_upload( _ => unreachable!(), }; + // ETag calculation: we produce ETags that have the same form as + // those of S3 multipart uploads, but we don't use their actual + // calculation for the first part (we use random bytes). This + // shouldn't impact compatibility as the S3 docs specify that + // the ETag is an opaque value in case of a multipart upload. + // See also: https://teppen.io/2018/06/23/aws_s3_etags/ + let num_parts = version.blocks().last().unwrap().part_number + - version.blocks().first().unwrap().part_number + + 1; + let etag = format!( + "{}-{}", + hex::encode(&rand::random::<[u8; 16]>()[..]), + num_parts + ); + // TODO: check that all the parts that they pretend they gave us are indeed there // TODO: when we read the XML from _req, remember to check the sha256 sum of the payload // against the signed x-amz-content-sha256 @@ -442,7 +457,7 @@ pub async fn handle_complete_multipart_upload( ObjectVersionMeta { headers, size: total_size, - etag: "".to_string(), // TODO + etag: etag, }, version.blocks()[0].hash, )); diff --git a/src/table/table.rs b/src/table/table.rs index 5dfee3c8..acb46325 100644 --- a/src/table/table.rs +++ b/src/table/table.rs @@ -391,7 +391,8 @@ where let (old_entry, new_entry) = self.store.transaction(|db| { let (old_entry, new_entry) = match db.get(&tree_key)? { Some(prev_bytes) => { - let old_entry = self.decode_entry(&prev_bytes) + let old_entry = self + .decode_entry(&prev_bytes) .map_err(sled::ConflictableTransactionError::Abort)?; let mut new_entry = old_entry.clone(); new_entry.merge(&update); -- cgit v1.2.3 From 132c54b8077422b611d6cf130592f32194ab53cd Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 5 Dec 2020 18:27:51 +0100 Subject: wip smoke test --- script/dev-env.sh | 16 ++++++---------- script/test-smoke.sh | 5 +++-- 2 files changed, 9 insertions(+), 12 deletions(-) mode change 100755 => 100644 script/dev-env.sh diff --git a/script/dev-env.sh b/script/dev-env.sh old mode 100755 new mode 100644 index 88d2941f..4c52568a --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -6,14 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" -ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1` -SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` - -alias s3grg="s3cmd \ - --host 127.0.0.1:3911 \ - --host-bucket 127.0.0.1:3911 \ - --access_key=$ACCESS_KEY \ - --secret_key=$SECRET_KEY \ - --region=garage \ - --no-ssl" +export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` +export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` +export AWS_DEFAULT_REGION='garage' +alias s3grg="aws s3 \ + --debug \ + --endpoint-url http://127.0.0.1:3911" diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 7b462b00..800836b0 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -15,8 +15,9 @@ 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 cp /tmp/garage.rnd s3://eprouvette/ s3grg ls s3://eprouvette -s3grg get s3://eprouvette/garage.rnd /tmp/garage.dl +s3grg cp s3://eprouvette/garage.rnd /tmp/garage.dl diff /tmp/garage.rnd /tmp/garage.dl +echo "success" -- cgit v1.2.3 From 28055b708fd27ed7407193eacdd5294b1192b067 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 09:13:47 +0100 Subject: Improve README, add more tests --- README.md | 23 +++++++++++++++-------- script/dev-env.sh | 1 - script/test-smoke.sh | 14 +++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 10dcc0cd..5e955f1a 100644 --- a/README.md +++ b/README.md @@ -20,17 +20,24 @@ Our main use case is to provide a distributed storage layer for small-scale self We propose the following quickstart to setup a full dev. environment as quickly as possible: - 1. Setup a rust/cargo environment and install s3cmd. eg. `dnf install rust cargo s3cmd` - 2. Run `cargo build` to build the project - 3. Run `./script/dev-cluster.sh` to launch a test cluster (feel free to read the script) - 4. Run `./script/dev-configure.sh` to configure your test cluster with default values (same datacenter, 100 tokens) - 5. Run `./script/dev-bucket.sh` to create a bucket named `éprouvette` and an API key that will be stored in `/tmp/garage.s3` - 6. Run `source ./script/dev-env.sh` to configure your CLI environment - 7. You can use `garage` to manage the cluster. Try `garage --help`. - 8. You can use `s3grg` to add, remove, and delete files. Try `s3grg --help`, `s3grg put /proc/cpuinfo s3://éprouvette/cpuinfo.txt`, `s3grg ls s3://éprouvette`. `s3grg` is a wrapper on `s3cmd` configured with the previously generated API key (the one in `/tmp/garage.s3`). + 1. Setup a rust/cargo environment. eg. `dnf install rust cargo` + 2. Install awscli v2 by following the guide [here](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html). + 3. Run `cargo build` to build the project + 4. Run `./script/dev-cluster.sh` to launch a test cluster (feel free to read the script) + 5. Run `./script/dev-configure.sh` to configure your test cluster with default values (same datacenter, 100 tokens) + 6. Run `./script/dev-bucket.sh` to create a bucket named `eprouvette` and an API key that will be stored in `/tmp/garage.s3` + 7. Run `source ./script/dev-env.sh` to configure your CLI environment + 8. You can use `garage` to manage the cluster. Try `garage --help`. + 9. You can use the `s3grg` alias to add, remove, and delete files. Try `s3grg help`, `s3grg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `s3grg ls s3://eprouvette`. `s3grg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint. Now you should be ready to start hacking on garage! +## S3 compatibility + +Only a subset of S3 is supported: adding, listing, getting and deleting files in a bucket. +Bucket management, ACL and other advanced features are not (yet?) handled through the S3 API but through `garage` CLI. +We primarily test `garage` against the `awscli` tool and `nextcloud`. + ## Setting up Garage Use the `genkeys.sh` script to generate TLS keys for encrypting communications between Garage nodes. diff --git a/script/dev-env.sh b/script/dev-env.sh index 4c52568a..15f08e2e 100644 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -11,5 +11,4 @@ export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` export AWS_DEFAULT_REGION='garage' alias s3grg="aws s3 \ - --debug \ --endpoint-url http://127.0.0.1:3911" diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 800836b0..eaf1556b 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -13,11 +13,15 @@ ${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 +dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1 +dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 +dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10 -s3grg cp /tmp/garage.rnd s3://eprouvette/ -s3grg ls s3://eprouvette -s3grg cp s3://eprouvette/garage.rnd /tmp/garage.dl +for idx in $(seq 1 3); do + s3grg cp /tmp/garage.$idx.rnd s3://eprouvette/ + s3grg ls s3://eprouvette + s3grg cp s3://eprouvette/garage.$idx.rnd /tmp/garage.$idx.dl + diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl +done -diff /tmp/garage.rnd /tmp/garage.dl echo "success" -- cgit v1.2.3 From 5c3dd9c74a27f82e4ba7f545ae23e3ba614f5d9b Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 09:54:11 +0100 Subject: Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e955f1a..1f5a56b1 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Now you should be ready to start hacking on garage! ## S3 compatibility Only a subset of S3 is supported: adding, listing, getting and deleting files in a bucket. -Bucket management, ACL and other advanced features are not (yet?) handled through the S3 API but through `garage` CLI. +Bucket management, ACL and other advanced features are not (yet?) handled through the S3 API but through the `garage` CLI. We primarily test `garage` against the `awscli` tool and `nextcloud`. ## Setting up Garage -- cgit v1.2.3 From a12930075dd33c7c18d6ad1afa4000efe55d10d6 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 10:04:17 +0100 Subject: Test garage list & delete commands --- script/test-smoke.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/script/test-smoke.sh b/script/test-smoke.sh index eaf1556b..3a84b992 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -13,6 +13,10 @@ ${SCRIPT_FOLDER}/dev-configure.sh ${SCRIPT_FOLDER}/dev-bucket.sh source ${SCRIPT_FOLDER}/dev-env.sh +garage status +garage key list +garage bucket list + dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1 dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10 @@ -22,6 +26,11 @@ for idx in $(seq 1 3); do s3grg ls s3://eprouvette s3grg cp s3://eprouvette/garage.$idx.rnd /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl + s3grg rm s3://eprouvette/garage.$idx.rnd done +garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID +garage bucket delete --yes eprouvette +garage key delete --yes $AWS_ACCESS_KEY_ID + echo "success" -- cgit v1.2.3 From d2d1fc676d0fe5b6fe927e4b6f6d2c162581971d Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 10:19:01 +0100 Subject: Test awscli/s3cmd interactions --- README.md | 4 ++-- script/dev-env-aws.sh | 14 ++++++++++++++ script/dev-env-s3cmd.sh | 19 +++++++++++++++++++ script/dev-env.sh | 14 -------------- script/test-smoke.sh | 26 +++++++++++++++++++++----- 5 files changed, 56 insertions(+), 21 deletions(-) create mode 100644 script/dev-env-aws.sh create mode 100644 script/dev-env-s3cmd.sh delete mode 100644 script/dev-env.sh diff --git a/README.md b/README.md index 1f5a56b1..8a6363ff 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ We propose the following quickstart to setup a full dev. environment as quickly 4. Run `./script/dev-cluster.sh` to launch a test cluster (feel free to read the script) 5. Run `./script/dev-configure.sh` to configure your test cluster with default values (same datacenter, 100 tokens) 6. Run `./script/dev-bucket.sh` to create a bucket named `eprouvette` and an API key that will be stored in `/tmp/garage.s3` - 7. Run `source ./script/dev-env.sh` to configure your CLI environment + 7. Run `source ./script/dev-env-aws.sh` to configure your CLI environment 8. You can use `garage` to manage the cluster. Try `garage --help`. - 9. You can use the `s3grg` alias to add, remove, and delete files. Try `s3grg help`, `s3grg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `s3grg ls s3://eprouvette`. `s3grg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint. + 9. You can use the `awsgrg` alias to add, remove, and delete files. Try `awsgrg help`, `awsgrg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `awsgrg ls s3://eprouvette`. `awsgrg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint. Now you should be ready to start hacking on garage! diff --git a/script/dev-env-aws.sh b/script/dev-env-aws.sh new file mode 100644 index 00000000..c9a57660 --- /dev/null +++ b/script/dev-env-aws.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +SCRIPT_FOLDER="`dirname \"${BASH_SOURCE[0]}\"`" +REPO_FOLDER="${SCRIPT_FOLDER}/../" +GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" +GARAGE_RELEASE="${REPO_FOLDER}/target/release/" +PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" + +export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` +export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` +export AWS_DEFAULT_REGION='garage' + +alias awsgrg="aws s3 \ + --endpoint-url http://127.0.0.1:3911" diff --git a/script/dev-env-s3cmd.sh b/script/dev-env-s3cmd.sh new file mode 100644 index 00000000..88d2941f --- /dev/null +++ b/script/dev-env-s3cmd.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +SCRIPT_FOLDER="`dirname \"${BASH_SOURCE[0]}\"`" +REPO_FOLDER="${SCRIPT_FOLDER}/../" +GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" +GARAGE_RELEASE="${REPO_FOLDER}/target/release/" +PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" + +ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1` +SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` + +alias s3grg="s3cmd \ + --host 127.0.0.1:3911 \ + --host-bucket 127.0.0.1:3911 \ + --access_key=$ACCESS_KEY \ + --secret_key=$SECRET_KEY \ + --region=garage \ + --no-ssl" + diff --git a/script/dev-env.sh b/script/dev-env.sh deleted file mode 100644 index 15f08e2e..00000000 --- a/script/dev-env.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCRIPT_FOLDER="`dirname \"${BASH_SOURCE[0]}\"`" -REPO_FOLDER="${SCRIPT_FOLDER}/../" -GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" -GARAGE_RELEASE="${REPO_FOLDER}/target/release/" -PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" - -export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` -export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` -export AWS_DEFAULT_REGION='garage' - -alias s3grg="aws s3 \ - --endpoint-url http://127.0.0.1:3911" diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 3a84b992..8a30429d 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -11,7 +11,8 @@ ${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 +source ${SCRIPT_FOLDER}/dev-env-aws.sh +source ${SCRIPT_FOLDER}/dev-env-s3cmd.sh garage status garage key list @@ -22,12 +23,27 @@ dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10 for idx in $(seq 1 3); do - s3grg cp /tmp/garage.$idx.rnd s3://eprouvette/ - s3grg ls s3://eprouvette - s3grg cp s3://eprouvette/garage.$idx.rnd /tmp/garage.$idx.dl + awsgrg cp /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.aws + awsgrg ls s3://eprouvette + awsgrg cp s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl - s3grg rm s3://eprouvette/garage.$idx.rnd + rm /tmp/garage.$idx.dl + s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl + diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + awsgrg rm s3://eprouvette/garage.$idx.aws + + s3grg put /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.s3cmd + s3grg ls s3://eprouvette + s3grg get s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl + diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + awsgrg cp s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl + diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + s3grg rm s3://eprouvette/garage.$idx.s3cmd done +rm /tmp/garage.{1,2,3}.rnd garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID garage bucket delete --yes eprouvette -- cgit v1.2.3 From a92868504f611adb6966a89602a72ae022222116 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 10:23:14 +0100 Subject: Indentation & comments --- script/test-smoke.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 8a30429d..9b1ca977 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -23,25 +23,35 @@ dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10 for idx in $(seq 1 3); do + # AWS sends awsgrg cp /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.aws + awsgrg ls s3://eprouvette + awsgrg cp s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl - rm /tmp/garage.$idx.dl - s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + + s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl - rm /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + awsgrg rm s3://eprouvette/garage.$idx.aws - s3grg put /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.s3cmd - s3grg ls s3://eprouvette - s3grg get s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl + # S3CMD sends + s3grg put /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.s3cmd + + s3grg ls s3://eprouvette + + s3grg get s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl - rm /tmp/garage.$idx.dl + rm /tmp/garage.$idx.dl + awsgrg cp s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl - rm /tmp/garage.$idx.dl - s3grg rm s3://eprouvette/garage.$idx.s3cmd + rm /tmp/garage.$idx.dl + + s3grg rm s3://eprouvette/garage.$idx.s3cmd done rm /tmp/garage.{1,2,3}.rnd -- cgit v1.2.3 From e13fd0954395836cd99e7deaeca7d0b7050802ee Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 6 Dec 2020 13:33:08 +0100 Subject: Reduce garage.1.rnd size to store it inline --- script/test-smoke.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test-smoke.sh b/script/test-smoke.sh index 9b1ca977..111afac9 100755 --- a/script/test-smoke.sh +++ b/script/test-smoke.sh @@ -18,7 +18,7 @@ garage status garage key list garage bucket list -dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1 +dd if=/dev/urandom of=/tmp/garage.1.rnd bs=1k count=2 # < INLINE_THRESHOLD = 3072 bytes dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5 dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10 -- cgit v1.2.3 From 022b386a5085cad79d649a82846c41cad730920b Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 6 Dec 2020 15:39:03 +0100 Subject: Improved compatibility on list API call --- src/api/s3_list.rs | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/api/s3_list.rs b/src/api/s3_list.rs index 3b739a8a..599d0d11 100644 --- a/src/api/s3_list.rs +++ b/src/api/s3_list.rs @@ -18,6 +18,7 @@ use crate::encoding::*; struct ListResultInfo { last_modified: u64, size: u64, + etag: String, } pub async fn handle_list( @@ -56,12 +57,12 @@ pub async fn handle_list( for object in objects.iter() { if !object.key.starts_with(prefix) { - truncated = false; + truncated = None; break 'query_loop; } if let Some(version) = object.versions().iter().find(|x| x.is_data()) { if result_keys.len() + result_common_prefixes.len() >= max_keys { - truncated = true; + truncated = Some(object.key.to_string()); break 'query_loop; } let common_prefix = if delimiter.len() > 0 { @@ -75,19 +76,18 @@ pub async fn handle_list( if let Some(pfx) = common_prefix { result_common_prefixes.insert(pfx.to_string()); } else { - let size = match &version.state { - ObjectVersionState::Complete(ObjectVersionData::Inline(meta, _)) => { - meta.size - } + let meta = match &version.state { + ObjectVersionState::Complete(ObjectVersionData::Inline(meta, _)) => meta, ObjectVersionState::Complete(ObjectVersionData::FirstBlock(meta, _)) => { - meta.size + meta } _ => unreachable!(), }; let info = match result_keys.get(&object.key) { None => ListResultInfo { last_modified: version.timestamp, - size, + size: meta.size, + etag: meta.etag.to_string(), }, Some(_lri) => { return Err(Error::Message(format!("Duplicate key?? {}", object.key))) @@ -98,7 +98,7 @@ pub async fn handle_list( } } if objects.len() < max_keys + 1 { - truncated = false; + truncated = None; break 'query_loop; } if objects.len() > 0 { @@ -113,11 +113,22 @@ pub async fn handle_list( r#""# ) .unwrap(); - writeln!(&mut xml, "\t{}", bucket).unwrap(); + writeln!(&mut xml, "\t{}", bucket).unwrap(); writeln!(&mut xml, "\t{}", prefix).unwrap(); + if let Some(mkr) = marker { + writeln!(&mut xml, "\t{}", mkr).unwrap(); + } writeln!(&mut xml, "\t{}", result_keys.len()).unwrap(); writeln!(&mut xml, "\t{}", max_keys).unwrap(); - writeln!(&mut xml, "\t{}", truncated).unwrap(); + writeln!( + &mut xml, + "\t{}", + truncated.is_some() + ) + .unwrap(); + if let Some(next_marker) = truncated { + writeln!(&mut xml, "\t{}", next_marker).unwrap(); + } for (key, info) in result_keys.iter() { let last_modif = NaiveDateTime::from_timestamp(info.last_modified as i64 / 1000, 0); let last_modif = DateTime::::from_utc(last_modif, Utc); @@ -132,6 +143,9 @@ pub async fn handle_list( .unwrap(); writeln!(&mut xml, "\t\t{}", last_modif).unwrap(); writeln!(&mut xml, "\t\t{}", info.size).unwrap(); + if !info.etag.is_empty() { + writeln!(&mut xml, "\t\t\"{}\"", info.etag).unwrap(); + } writeln!(&mut xml, "\t\tSTANDARD").unwrap(); writeln!(&mut xml, "\t").unwrap(); } -- cgit v1.2.3