cargo fmt

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/44

.drone.yml

@@ -36,19 +36,8 @@ steps:
       branch:
       - nonexistent_skip_this_step
 
-  - name: code quality
-    image: superboum/garage_builder_amd64:4
-    volumes:
-    - name: cargo_home
-      path: /drone/cargo
-    environment:
-      CARGO_HOME: /drone/cargo
-    commands:
-      - cargo fmt -- --check
-      - cargo clippy -- --deny warnings
-
   - name: build
-    image: superboum/garage_builder_amd64:4
+    image: lxpz/garage_builder_amd64:1
     volumes:
     - name: cargo_home
       path: /drone/cargo
@@ -56,10 +45,11 @@ steps:
       CARGO_HOME: /drone/cargo
     commands:
       - pwd
+      - cargo fmt -- --check
       - cargo build
 
   - name: cargo-test
-    image: superboum/garage_builder_amd64:4
+    image: lxpz/garage_builder_amd64:1
     volumes:
     - name: cargo_home
       path: /drone/cargo
@@ -95,7 +85,7 @@ steps:
       - nonexistent_skip_this_step
 
   - name: smoke-test
-    image: superboum/garage_builder_amd64:4
+    image: lxpz/garage_builder_amd64:1
     volumes:
     - name: cargo_home
       path: /drone/cargo
@@ -139,6 +129,6 @@ steps:
 
 ---
 kind: signature
-hmac: e919f8a66d20ebfeeec56b291a8a0fdd59a482601da987fcf533d96d24768744
+hmac: de82026387bd09e547dbc9cc5d232fd865204b4f393d32508c50b58f8e60611d
 
 ...

Cargo.lock

@@ -95,6 +95,9 @@ name = "cc"
 version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cfg-if"
@@ -221,6 +224,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "fastcdc"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5afa29be46b12c8c380b997def8d1ac77c2665da93eb0a768fab0bf4db79333f"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -350,22 +359,22 @@ dependencies = [
 
 [[package]]
 name = "garage"
-version = "0.3.0"
+version = "0.2.1"
 dependencies = [
  "bytes",
  "futures",
  "futures-util",
  "garage_api",
  "garage_model",
- "garage_rpc 0.3.0",
+ "garage_rpc",
  "garage_table",
- "garage_util 0.3.0",
+ "garage_util",
  "garage_web",
  "git-version",
  "hex",
  "log",
  "pretty_env_logger",
- "rand",
+ "rand 0.8.3",
  "rmp-serde",
  "serde",
  "sled",
@@ -376,18 +385,19 @@ dependencies = [
 
 [[package]]
 name = "garage_api"
-version = "0.3.0"
+version = "0.2.1"
 dependencies = [
  "base64",
  "bytes",
  "chrono",
  "crypto-mac 0.10.0",
  "err-derive",
+ "fastcdc",
  "futures",
  "futures-util",
  "garage_model",
  "garage_table",
- "garage_util 0.3.0",
+ "garage_util",
  "hex",
  "hmac",
  "http",
@@ -397,9 +407,8 @@ dependencies = [
  "log",
  "md-5",
  "percent-encoding",
- "quick-xml",
+ "rand 0.7.3",
  "roxmltree",
- "serde",
  "sha2",
  "tokio",
  "url",
@@ -407,61 +416,34 @@ dependencies = [
 
 [[package]]
 name = "garage_model"
-version = "0.3.0"
+version = "0.2.1"
 dependencies = [
  "arc-swap",
  "futures",
  "futures-util",
- "garage_rpc 0.3.0",
+ "garage_rpc",
  "garage_table",
- "garage_util 0.3.0",
+ "garage_util",
  "hex",
  "log",
- "rand",
+ "rand 0.8.3",
  "rmp-serde",
  "serde",
  "serde_bytes",
  "sled",
  "tokio",
+ "zstd",
 ]
 
 [[package]]
 name = "garage_rpc"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c182633cebe4abed9594afb14770fc45402513765d38a4b19659ae0ccb2a2f"
 dependencies = [
  "arc-swap",
  "bytes",
  "futures",
  "futures-util",
- "garage_util 0.2.1",
+ "garage_util",
- "gethostname",
- "hex",
- "http",
- "hyper",
- "hyper-rustls",
- "log",
- "rmp-serde",
- "rustls",
- "serde",
- "serde_json",
- "tokio",
- "tokio-rustls",
- "tokio-stream",
- "webpki",
-]
-
-[[package]]
-name = "garage_rpc"
-version = "0.3.0"
-dependencies = [
- "arc-swap",
- "bytes",
- "futures",
- "futures-util",
- "garage_rpc 0.2.1",
- "garage_util 0.3.0",
  "gethostname",
  "hex",
  "http",
@@ -480,16 +462,16 @@ dependencies = [
 
 [[package]]
 name = "garage_table"
-version = "0.3.0"
+version = "0.2.1"
 dependencies = [
  "bytes",
  "futures",
  "futures-util",
- "garage_rpc 0.3.0",
+ "garage_rpc",
- "garage_util 0.3.0",
+ "garage_util",
  "hexdump",
  "log",
- "rand",
+ "rand 0.8.3",
  "rmp-serde",
  "serde",
  "serde_bytes",
@@ -500,8 +482,6 @@ dependencies = [
 [[package]]
 name = "garage_util"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef76d3779e406a16fdcaffe8d86b8ae2943a549d2b33f2c20930838764464c0"
 dependencies = [
  "blake2",
  "chrono",
@@ -511,32 +491,7 @@ dependencies = [
  "http",
  "hyper",
  "log",
- "rand",
+ "rand 0.8.3",
- "rmp-serde",
- "rustls",
- "serde",
- "serde_json",
- "sha2",
- "sled",
- "tokio",
- "toml",
- "webpki",
- "xxhash-rust",
-]
-
-[[package]]
-name = "garage_util"
-version = "0.3.0"
-dependencies = [
- "blake2",
- "chrono",
- "err-derive",
- "futures",
- "hex",
- "http",
- "hyper",
- "log",
- "rand",
  "rmp-serde",
  "rustls",
  "serde",
@@ -551,14 +506,14 @@ dependencies = [
 
 [[package]]
 name = "garage_web"
-version = "0.3.0"
+version = "0.2.1"
 dependencies = [
  "err-derive",
  "futures",
  "garage_api",
  "garage_model",
  "garage_table",
- "garage_util 0.3.0",
+ "garage_util",
  "http",
  "hyper",
  "idna",
@@ -586,6 +541,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.2"
@@ -594,7 +560,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -817,6 +783,15 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
+[[package]]
+name = "jobserver"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.49"
@@ -1091,16 +1066,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quick-xml"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0452695941410a58c8ce4391707ba9bad26a247173bd9886a05a5e8a8babec75"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.9"
@@ -1110,6 +1075,19 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.3"
@@ -1117,9 +1095,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
 dependencies = [
  "libc",
- "rand_chacha",
+ "rand_chacha 0.3.0",
- "rand_core",
+ "rand_core 0.6.2",
- "rand_hc",
+ "rand_hc 0.3.0",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -1129,7 +1117,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
 ]
 
 [[package]]
@@ -1138,7 +1135,16 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.2",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -1147,7 +1153,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
 dependencies = [
- "rand_core",
+ "rand_core 0.6.2",
 ]
 
 [[package]]
@@ -1648,6 +1654,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.10.2+wasi-snapshot-preview1"
@@ -1770,3 +1782,32 @@ name = "xxhash-rust"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e575e15bedf6e57b5c2d763ffc6c3c760143466cbd09d762d539680ab5992ded"
+
+[[package]]
+name = "zstd"
+version = "0.6.1+zstd.1.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "3.0.1+zstd.1.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "1.4.20+zstd.1.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
+dependencies = [
+ "cc",
+ "libc",
+]

Makefile

@@ -1,5 +1,20 @@
+BIN=target/release/garage
+DOCKER=lxpz/garage_amd64
+
 all:
 	clear; cargo build
 
-release:
+$(BIN):
 	RUSTFLAGS="-C link-arg=-fuse-ld=lld -C target-cpu=x86-64 -C target-feature=+sse2" cargo build --release --no-default-features
+
+$(BIN).stripped: $(BIN)
+	cp $^ $@
+	strip $@
+
+docker: $(BIN).stripped
+	docker pull archlinux:latest
+	docker build -t $(DOCKER):$(TAG) .
+	docker push $(DOCKER):$(TAG)
+	docker tag $(DOCKER):$(TAG) $(DOCKER):latest
+	docker push $(DOCKER):latest
+	

config.dev.toml

@@ -0,0 +1,22 @@
+block_size = 1048576			# objects are split in blocks of maximum this number of bytes
+
+metadata_dir = "/tmp/garage-meta"
+data_dir = "/tmp/garage-data"
+
+rpc_bind_addr = "[::]:3901"		# the port other Garage nodes will use to talk to this node
+
+bootstrap_peers = []
+
+max_concurrent_rpc_requests = 12
+data_replication_factor = 3
+meta_replication_factor = 3
+meta_epidemic_fanout = 3
+
+[s3_api]
+api_bind_addr = "[::1]:3900"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
+s3_region = "garage"				# set this to anything. S3 API calls will fail if they are not made against the region set here.
+
+[s3_web]
+bind_addr = "[::1]:3902"
+root_domain = ".garage.tld"
+index = "index.html"

doc/book/src/intro.md

@@ -4,13 +4,6 @@
 	</a>
 </p>
 
-<p align="center" style="text-align:center;">
-	[ <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage">Git repository</a>
-	| <a href="https://matrix.to/#/%23garage:deuxfleurs.fr">Matrix channel</a>
-	| <a href="https://drone.deuxfleurs.fr/Deuxfleurs/garage">Drone CI</a>
-	]
-</p>
-
 ```
 This very website is hosted using Garage. In other words: the doc is the PoC!
 ```
@@ -96,9 +89,7 @@ If you encounter a specific bug in Garage or plan to patch it, you may jump dire
 
 We love to talk and hear about Garage, that's why we keep a log here:
 
-  - [(en, 2021-04-28) Distributed object storage is centralised](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2021-04-28_spirals-team/talk.pdf)
+  - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/doc/20201202_talk/talk.pdf)
-
-  - [(fr, 2020-12-02) Garage : jouer dans la cour des grands quand on est un hébergeur associatif](https://git.deuxfleurs.fr/Deuxfleurs/garage/raw/commit/b1f60579a13d3c5eba7f74b1775c84639ea9b51a/doc/talks/2020-12-02_wide-team/talk.pdf)
 
 *Did you write or talk about Garage? [Open a pull request](https://git.deuxfleurs.fr/Deuxfleurs/garage/) to add a link here!*
 

doc/talks/2021-04-28_spirals-team/.gitignore

@@ -1,10 +0,0 @@
-*.bbl
-*.aux
-*.bcf
-*.blg
-*.log
-*.run.xml
-*.synctex.gz
-build/
-main.pdf
-figures/crdt.pdf

doc/talks/2021-04-28_spirals-team/Makefile

@@ -1,33 +0,0 @@
-.PHONY: all viewpdf pdf clean
-
-TARGET       = main
-SOURCE_FILES = $(shell find . -type f -name "*.tex" -print)
-CLASS_FILES  = $(shell find . -type f -name "*.cls" -print)
-BIB_FILES    = $(shell find . -type f -name "*.bib" -print)
-FIGURES      = $(shell find . -path "./figures/*" -type f -print)
-BUILD_PATH   = build
-BUILD_FILES  = $(shell find $(BUILD_PATH) -type f -print)
-
-BIB_PROCESSOR := biber
-
-.PHONY: all pdf clean figures
-
-all: pdf
-
-pdf: $(TARGET).pdf
-
-clean:
-	@rm $(TARGET).pdf $(BUILD_FILES) > /dev/null 2>&1 || exit 0
-
-figures: figures/crdt.pdf
-
-$(TARGET).pdf: figures $(FIGURES) $(SOURCE_FILES) $(BIB_FILES) $(CLASS_FILES)
-	@mkdir -p $(BUILD_PATH) > /dev/null 2>&1 || exit 0
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex
-	@$(BIB_PROCESSOR) --output-directory $(BUILD_PATH) $(TARGET)
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex # For biber
-	@pdflatex -interaction=nonstopmode -jobname=$(TARGET) -output-directory $(BUILD_PATH) $(TARGET).tex # For biber
-	@ln -fs $(BUILD_PATH)/$(TARGET).pdf $(TARGET).pdf
-
-figures/crdt.pdf: figures/svg/crdt.svg
-	@inkscape -C --file=$< --export-pdf=$@

doc/talks/2021-04-28_spirals-team/README.md

@@ -1 +0,0 @@
-Presentation of Garage by Adrien on April, 28th 2021, for his research team [Spirals](https://team.inria.fr/spirals/).

doc/talks/2021-04-28_spirals-team/bibliography.bib

@@ -1,27 +0,0 @@
-
-@inproceedings{brewer_towards_2000,
-  title = {Towards {{Robust Distributed Systems}}},
-  booktitle = {{{ACM PODC}}},
-  author = {Brewer, Eric},
-  year = {2000}
-}
-
-
-
-@incollection{defago_conflict-free_2011,
-  title = {Conflict-{{Free Replicated Data Types}}},
-  booktitle = {Stabilization, {{Safety}}, and {{Security}} of {{Distributed Systems}}},
-  author = {Shapiro, Marc and Pregui{\c c}a, Nuno and Baquero, Carlos and Zawirski, Marek},
-  year = {2011},
-  address = {{Berlin, Heidelberg}},
-}
-
-
-@inproceedings{decandia_dynamo:_2007,
-  title = {Dynamo: {{Amazon}}'s {{Highly Available Key}}-Value {{Store}}},
-  booktitle = {{ACM SOSP}},
-  author = {DeCandia, Giuseppe and Hastorun, Deniz and Jampani, Madan and Kakulapati, Gunavardhan and Lakshman, Avinash and Pilchin, Alex and Sivasubramanian, Swaminathan and Vosshall, Peter and Vogels, Werner},
-  year = {2007},
-  address = {{New York, USA}},
-}
-

doc/talks/2021-04-28_spirals-team/conclusion.tex

@@ -1,7 +0,0 @@
-\section{Conclusion}
-
-\begin{frame}{The future is cooler when we bend it our way}
-
-Contributions welcome! :D
-
-\end{frame}

doc/talks/2021-04-28_spirals-team/escaping_the_cloud.tex

@@ -1,124 +0,0 @@
-\section{Escaping the cloud}
-
-% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \begin{frame}{Down to Earth with home-hosting}
-
-
-% \todo{Stanley Parabole reference?}
-
-% \end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Why?}
-
-\begin{itemize}
-	\item \textbf{Privacy}: no prying eyes besides your ISP
-	\item \textbf{Control} of your infrastructure
-	\item \textbf{Ecology}: reuse old hardware
-\end{itemize}
-
-\vfill
-\begin{block}{\emph{Tim Berners-Lee} (1994)}
-``Now, if someone tries to monopolize the Web, for example pushes proprietary variations on network protocols, then that would make me unhappy.''
-\end{block}
-
-\begin{itemize}
-	\item Make Tim Berners-Lee happy
-\end{itemize}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{What?}
-
-\centering\Large
-A data store for commodity hardware on heterogenous household connections. 
-
-
-\vfill\raggedright\normalsize
-
-
-\begin{block}{Targetting user-facing services}
-\begin{itemize}
-	\item Static sites 
-	\item E-mails
-	\item Instant communication
-	%\item Video streaming % No need for a data store
-	\item Collaboration 
-\end{itemize}
-\end{block}
-\vfill
-
-Nothing fancy like sensors data streams, AI or IoT.
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{What?}
-
-
-\begin{block}{Requirements}
-\begin{itemize}
-	\item \textbf{No single point of failure} / flat hierarchy: 
-
-	Any node can die for extended periods of time.
-	\item \textbf{Multi-site}: cluster spans regions/countries.
-	\item \textbf{Acceptable performance}.
-	\item \textbf{Lightweight}: targets legacy hardware.
-	\item \textbf{Conceptually simple}: built for low-tech organisations.
-
-	Adding/maintaining cluster nodes should be easy.
-\end{itemize}
-\end{block}
-\vfill 
-
-\begin{block}{Non-goals}
-\begin{itemize}
-	\item \textbf{Super badass performance}.
-	\item \textbf{NAT traversal} etc.: we require full-mesh connectivity.
-\end{itemize}
-\end{block}
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{How?}
-
-\begin{itemize}
-	\item Theoretically possible with object storage \& CRDTs.
-	\vfill
-	\item Household uplinks are getting decent (optical fibers).
-\end{itemize}
-
-
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Research Questions}
-
-\begin{itemize}
-	\item Decent performance despite bad inter-node connectivity.
-	\vfill
-
-	\item Tailoring workloads as a function of nodes' capabilities:
-
-	\begin{itemize}
-		\item Make use of low-end nodes (e.g. Raspberry Pis),
-		\item Avoid impeding global performance because of low-end nodes.
-	\end{itemize}
-	\vfill
-
-	\item Building CRDTs for target use-cases:
-
-	\begin{itemize}
-		\item Software engineering: DSL or native code?
-		\item Provide APIs to data store users? Risky?
-	\end{itemize}
-	\vfill
-
-	\item Cluster management: effortless UX, low perf. overhead.
-\end{itemize}
-\end{frame}

doc/talks/2021-04-28_spirals-team/figures/svg/conflict.svg

@@ -1,930 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="119.30722mm"
-   height="121.49291mm"
-   viewBox="0 0 119.30722 121.49291"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="conflict.svg">
-  <defs
-     id="defs2">
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker2999"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2997"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker2964"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2962"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1467"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1465"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker1449"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend">
-      <path
-         inkscape:connector-curvature="0"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path1447" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker12071"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path12069"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker9668"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend"
-       inkscape:collect="always">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path9666"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker6943"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path6941"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker5445"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow1Mend">
-      <path
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         id="path5443"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1115"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path861"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path826"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path820"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker1101"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1099"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path817"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="244.86596"
-     inkscape:cy="205.06317"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer5"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1055"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-global="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Common"
-     transform="translate(-43.663712,-16.067619)"
-     style="display:inline">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 99.856918,34.684511 h 4.913692"
-       id="path1257"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
-       d="M 102.31376,23.208557 V 135.9963"
-       id="path815"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="90.524658"
-       y="19.57423"
-       id="text838"><tspan
-         sodipodi:role="line"
-         id="tspan836"
-         x="90.524658"
-         y="19.57423"
-         style="font-weight:bold;stroke-width:0.26458332px"># vaccines</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="46.748138"
-       y="19.57423"
-       id="text13775"><tspan
-         sodipodi:role="line"
-         id="tspan13773"
-         x="46.748138"
-         y="19.57423"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Iwona;-inkscape-font-specification:'Iwona Italic';stroke-width:0.26458332px">Paris</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="148.20457"
-       y="19.57423"
-       id="text13798"><tspan
-         sodipodi:role="line"
-         id="tspan13796"
-         x="148.20457"
-         y="19.57423"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Iwona;-inkscape-font-specification:'Iwona Italic';stroke-width:0.26458332px">Lille</tspan></text>
-  </g>
-  <g
-     inkscape:label="The problem"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:none"
-     transform="translate(-43.663712,-16.067619)">
-    <g
-       id="g13753"
-       transform="translate(0,12.170833)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path850"
-         d="M 97.820644,51.619712 75.828475,64.316897"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1115)" />
-      <text
-         y="-108.69946"
-         x="-183.00148"
-         transform="rotate(180,91.874093,54.229103)"
-         id="text7803"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath7973"
-           xlink:href="#path850"><tspan
-   id="tspan7801"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-         d="M 75.056888,72.78638 97.049057,85.483565"
-         id="path9498"
-         inkscape:connector-curvature="0" />
-      <text
-         transform="translate(9.4212508,3.3408691)"
-         y="2.986012"
-         x="8.5186663"
-         id="text10668"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath10836"
-           xlink:href="#path9498"><tspan
-   id="tspan10666"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <g
-       id="g13763"
-       transform="translate(0,12.170833)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)"
-         d="m 106.80689,51.619712 21.99218,12.697185"
-         id="path11899"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path11901"
-         d="M 129.57066,72.78638 107.57848,85.483565"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text13737"
-         transform="rotate(-115.89278,108.31787,47.643413)"
-         x="-372.04132"
-         y="-217.15767"><textPath
-           xlink:href="#path850"
-           id="textPath13735"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13733">R</tspan></textPath></text>
-      <text
-         transform="rotate(-58.856754,100.88692,38.870944)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text13743"
-         x="46.604572"
-         y="6.6609678"><textPath
-           xlink:href="#path9498"
-           id="textPath13741"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13739">W</tspan></textPath></text>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path13768"
-       d="m 99.856918,112.89149 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="43.564934"
-       y="53.51746"
-       id="text13802"><tspan
-         sodipodi:role="line"
-         id="tspan13800"
-         x="43.564934"
-         y="53.51746"
-         style="stroke-width:0.26458332px">We acquired 1000 doses!</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="49.979401"
-       y="82.649841"
-       id="text13806"><tspan
-         sodipodi:role="line"
-         id="tspan13804"
-         x="49.979401"
-         y="82.649841"
-         style="stroke-width:0.26458332px">x + 1000</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="136.842"
-       y="82.649841"
-       id="text13810"><tspan
-         sodipodi:role="line"
-         id="tspan13808"
-         x="136.842"
-         y="82.649841"
-         style="stroke-width:0.26458332px">x + 500</tspan></text>
-    <text
-       id="text13814"
-       y="53.51746"
-       x="112.88577"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="53.51746"
-         x="112.88577"
-         id="tspan13812"
-         sodipodi:role="line">We acquired 500 doses!</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.70142"
-       y="114.62009"
-       id="text13818"><tspan
-         sodipodi:role="line"
-         id="tspan13816"
-         x="108.70142"
-         y="114.62009"
-         style="font-weight:bold;stroke-width:0.26458332px">???</tspan></text>
-    <text
-       id="text3109"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3107"
-         sodipodi:role="line">T0: 5000</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="ACID"
-     style="display:none">
-    <rect
-       ry="5.2916665"
-       y="67.923912"
-       x="61.174206"
-       height="39.498508"
-       width="54.42857"
-       id="rect14092"
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-    <rect
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke"
-       id="rect14090"
-       width="54.42857"
-       height="39.498508"
-       x="1.6973262"
-       y="21.886396"
-       ry="5.2916665" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path14037"
-       d="m 56.193207,64.654408 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 56.193207,110.69192 h 4.913692"
-       id="path14040"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g14075"
-       transform="translate(0,-1.9988201)">
-      <g
-         id="g13993"
-         transform="translate(-43.663711,-25.06345)"
-         style="display:inline">
-        <path
-           inkscape:connector-curvature="0"
-           id="path13977"
-           d="M 97.820644,51.619712 75.828475,64.316897"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1115)" />
-        <text
-           y="-108.69946"
-           x="-183.00148"
-           transform="rotate(180,91.874093,54.229103)"
-           id="text13983"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><textPath
-             id="textPath13981"
-             xlink:href="#path850"><tspan
-   id="tspan13979"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-           d="M 75.056888,72.78638 97.049057,85.483565"
-           id="path13985"
-           inkscape:connector-curvature="0" />
-        <text
-           transform="translate(9.4212508,3.3408691)"
-           y="2.986012"
-           x="8.5186663"
-           id="text13991"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           xml:space="preserve"><textPath
-             id="textPath13989"
-             xlink:href="#path9498"><tspan
-   id="tspan13987"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-      </g>
-      <text
-         id="text14044"
-         y="29.833508"
-         x="3.4844763"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="stroke-width:0.26458332px"
-           y="29.833508"
-           x="3.4844763"
-           id="tspan14042"
-           sodipodi:role="line">AcqDoses(1000)</tspan></text>
-    </g>
-    <g
-       id="g14088"
-       transform="translate(0,-0.41130478)">
-      <g
-         id="g14011"
-         transform="translate(-43.663711,19.386549)"
-         style="display:inline">
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)"
-           d="m 106.80689,51.619712 21.99218,12.697185"
-           id="path13995"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path13997"
-           d="M 129.57066,72.78638 107.57848,85.483565"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text14003"
-           transform="rotate(-115.89278,108.31787,47.643413)"
-           x="-372.04132"
-           y="-217.15767"><textPath
-             xlink:href="#path850"
-             id="textPath14001"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan13999">R</tspan></textPath></text>
-        <text
-           transform="rotate(-58.856754,100.88692,38.870944)"
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="text14009"
-           x="46.604572"
-           y="6.6609678"><textPath
-             xlink:href="#path9498"
-             id="textPath14007"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan14005">W</tspan></textPath></text>
-      </g>
-      <text
-         id="text14044-8"
-         y="74.283508"
-         x="82.76487"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="stroke-width:0.26458332px"
-           y="74.283508"
-           x="82.76487"
-           id="tspan14042-8"
-           sodipodi:role="line">AcqDoses(500)</tspan></text>
-    </g>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="82.757004"
-       id="text832-6"><tspan
-         sodipodi:role="line"
-         id="tspan830-8"
-         x="108.80019"
-         y="82.757004"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T1: 6000</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="128.8701"
-       id="text832-3"><tspan
-         sodipodi:role="line"
-         id="tspan830-83"
-         x="108.80019"
-         y="128.8701"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T2: 6500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="108.80019"
-       y="36.388439"
-       id="text3117"><tspan
-         sodipodi:role="line"
-         id="tspan3115"
-         x="108.80019"
-         y="36.388439"
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px">T0: 5000</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="BASE"
-     style="display:none">
-    <g
-       id="g1463"
-       transform="translate(0,-21.166667)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         id="path1369"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text1375"
-         transform="rotate(180,70.308075,52.117558)"
-         x="-279.42224"
-         y="-209.36409"><textPath
-           xlink:href="#path850"
-           id="textPath1373"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan1371">R</tspan></textPath></text>
-    </g>
-    <g
-       id="g1481"
-       transform="translate(0,-21.166667)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1377"
-         d="M 31.393177,68.889594 53.385346,81.586779"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1467)" />
-      <text
-         transform="translate(-34.395836)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text1383"
-         x="17.939917"
-         y="6.3268809"><textPath
-           xlink:href="#path9498"
-           id="textPath1381"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan1379">W</tspan></textPath></text>
-    </g>
-    <g
-       style="display:inline"
-       transform="translate(-43.663711,-25.063453)"
-       id="g1403">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1387"
-         d="m 106.80689,51.619712 21.99218,12.697185"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker12071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker9668)"
-         d="M 129.57066,72.78638 107.57848,85.483565"
-         id="path1389"
-         inkscape:connector-curvature="0" />
-      <text
-         y="-217.15767"
-         x="-372.04132"
-         transform="rotate(-115.89278,108.31787,47.643413)"
-         id="text1395"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath1393"
-           xlink:href="#path850"><tspan
-   id="tspan1391"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-      <text
-         y="6.6609678"
-         x="46.604572"
-         id="text1401"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"
-         transform="rotate(-58.856754,100.88692,38.870944)"><textPath
-           id="textPath1399"
-           xlink:href="#path9498"><tspan
-   id="tspan1397"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path1503"
-       d="m 56.193207,73.650233 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       id="text1507"
-       y="75.354156"
-       x="64.607315"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="75.354156"
-         x="64.607315"
-         id="tspan1505"
-         sodipodi:role="line">T1: [(T0, 6000),(T0, 5500)]</tspan></text>
-    <g
-       id="g1530"
-       transform="translate(0,38.100002)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path1522"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)" />
-      <text
-         y="-209.36409"
-         x="-279.42224"
-         transform="rotate(180,70.308075,52.117558)"
-         id="text1528"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><textPath
-           id="textPath1526"
-           xlink:href="#path850"><tspan
-   id="tspan1524"
-   style="font-weight:bold;stroke-width:0.26458332px">R</tspan></textPath></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="8.5044641"
-       y="109.58665"
-       id="text1534"><tspan
-         sodipodi:role="line"
-         id="tspan1532"
-         x="8.5044641"
-         y="109.58665"
-         style="font-weight:normal;stroke-width:0.26458332px">Now solve this!</tspan><tspan
-         sodipodi:role="line"
-         x="8.5044641"
-         y="115.76025"
-         style="font-weight:normal;stroke-width:0.26458332px"
-         id="tspan3159">And write back!</tspan></text>
-    <text
-       id="text1538"
-       y="44.886383"
-       x="6.3156896"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="44.886383"
-         x="6.3156896"
-         id="tspan1536"
-         sodipodi:role="line">x + 1000</tspan></text>
-    <text
-       id="text1542"
-       y="44.886383"
-       x="93.178284"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.26458332px"
-         y="44.886383"
-         x="93.178284"
-         id="tspan1540"
-         sodipodi:role="line">x + 500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       id="text3103"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3101"
-         sodipodi:role="line">T0: (⊥, 5000)</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="CRDT"
-     style="display:inline">
-    <g
-       style="display:inline"
-       transform="translate(0,-21.166667)"
-       id="g2920">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1467)"
-         d="M 31.393177,68.889594 53.385346,81.586779"
-         id="path2912"
-         inkscape:connector-curvature="0" />
-      <text
-         y="6.3268809"
-         x="17.939917"
-         id="text2918"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"
-         transform="translate(-34.395836)"><textPath
-           id="textPath2916"
-           xlink:href="#path9498"><tspan
-   id="tspan2914"
-   style="font-weight:bold;stroke-width:0.26458332px">W</tspan></textPath></text>
-    </g>
-    <g
-       id="g3013">
-      <path
-         inkscape:connector-curvature="0"
-         id="path2924"
-         d="M 85.906949,47.722927 63.914769,60.420112"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker2999)" />
-      <text
-         transform="rotate(-58.856754,57.228059,65.935492)"
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text2936"
-         x="7.1585193"
-         y="48.970455"><textPath
-           xlink:href="#path9498"
-           id="textPath2934"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan2932">W</tspan></textPath></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="15.648211"
-       y="44.007793"
-       id="text2976"><tspan
-         sodipodi:role="line"
-         id="tspan2974"
-         x="15.648211"
-         y="44.007793"
-         style="font-weight:normal;stroke-width:0.26458332px">incr(1000)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="82.927979"
-       y="44.007793"
-       id="text2980"><tspan
-         sodipodi:role="line"
-         id="tspan2978"
-         x="82.927979"
-         y="44.007793"
-         style="font-weight:normal;stroke-width:0.26458332px">incr(500)</tspan></text>
-    <path
-       inkscape:connector-curvature="0"
-       id="path2982"
-       d="m 56.193207,72.591896 h 4.913692"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       id="text2986"
-       y="74.295815"
-       x="65.136482"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="74.295815"
-         x="65.136482"
-         sodipodi:role="line"
-         id="tspan2995">T1: (5000, </tspan><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="79.777985"
-         x="65.136482"
-         sodipodi:role="line"
-         id="tspan1204">      {(a, 1000), (b, 500)})</tspan></text>
-    <g
-       style="display:inline"
-       transform="translate(0,38.100003)"
-       id="g3042">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.52969581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker1449)"
-         d="M 54.156933,47.722926 32.164764,60.420111"
-         id="path3034"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="text3040"
-         transform="rotate(180,70.308075,52.117558)"
-         x="-279.42224"
-         y="-209.36409"><textPath
-           xlink:href="#path850"
-           id="textPath3038"><tspan
-   style="font-weight:bold;stroke-width:0.26458332px"
-   id="tspan3036">R</tspan></textPath></text>
-    </g>
-    <text
-       id="text3051"
-       y="102.21611"
-       x="17.764879"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;stroke-width:0.26458332px"
-         y="102.21611"
-         x="17.764879"
-         id="tspan3049"
-         sodipodi:role="line">6500</tspan></text>
-    <text
-       transform="translate(-43.663711,-16.067619)"
-       id="text3097"
-       y="36.388439"
-       x="108.80019"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;font-size:4.93888903px;stroke-width:0.26458332px"
-         y="36.388439"
-         x="108.80019"
-         id="tspan3095"
-         sodipodi:role="line">T0: (5000, ∅)</tspan></text>
-  </g>
-</svg>

doc/talks/2021-04-28_spirals-team/figures/svg/crdt.svg

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="82.010674mm"
-   height="17.561125mm"
-   viewBox="0 0 82.010674 17.561125"
-   version="1.1"
-   id="svg1579"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="crdt.svg">
-  <defs
-     id="defs1573">
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2645"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mend">
-      <path
-         transform="scale(-0.6)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path2643"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2605"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mstart">
-      <path
-         transform="scale(0.6)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path2603"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path2206"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mstart"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path2203"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(0.6)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2197"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2191"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="148.82928"
-     inkscape:cy="-32.722297"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1055"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-21.438257,-19.857903)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Mstart);marker-end:url(#Arrow2Mend)"
-       d="M 44.979166,28.87314 H 58.822544"
-       id="path2177"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g2153">
-      <rect
-         rx="0"
-         ry="3.8793426"
-         y="19.990194"
-         x="21.570549"
-         height="17.296541"
-         width="23.537758"
-         id="rect2124"
-         style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-      <text
-         id="text2132"
-         y="29.799105"
-         x="29.366098"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-weight:normal;stroke-width:0.26458332px"
-           y="29.799105"
-           x="29.366098"
-           id="tspan2130"
-           sodipodi:role="line">App</tspan></text>
-    </g>
-    <rect
-       rx="0"
-       ry="3.8793426"
-       y="19.990194"
-       x="58.612213"
-       height="17.296541"
-       width="23.537758"
-       id="rect2155"
-       style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-    <text
-       id="text2159"
-       y="30.367077"
-       x="63.842014"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-weight:normal;stroke-width:0.26458332px"
-         y="30.367077"
-         x="63.842014"
-         id="tspan2157"
-         sodipodi:role="line">CRDT</tspan></text>
-    <g
-       id="g4137"
-       transform="translate(-15.875)">
-      <rect
-         rx="0"
-         ry="3.8793426"
-         y="19.990194"
-         x="95.653885"
-         height="17.296541"
-         width="23.537758"
-         id="rect2163"
-         style="opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:0.97409327;fill-rule:nonzero;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.91191711;paint-order:fill markers stroke" />
-      <text
-         id="text2167"
-         y="30.367077"
-         x="96.969627"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93888855px;line-height:125%;font-family:Iwona;-inkscape-font-specification:'Iwona, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           style="font-weight:normal;stroke-width:0.26458332px"
-           y="30.367077"
-           x="96.969627"
-           id="tspan2165"
-           sodipodi:role="line">Datastore</tspan></text>
-    </g>
-  </g>
-</svg>

doc/talks/2021-04-28_spirals-team/garage.tex

@@ -1,147 +0,0 @@
-\section{Introducing Garage}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Brought to you by the Deuxfleurs association}
-
-\begin{block}{\textbf{deuxfleurs.fr} -- a libre hosting association with a vision}
-``Shifting the current structure of the Internet from a world of a few very large service providers, to a world where services are hosted by a variety of smaller organisations.''	
-\end{block}
-
-
-\begin{block}{Our goals}
-\begin{itemize}
-	\item To propose performant \& reliable libre services for the masses
-	\item To host and administer our infrastructure ourselves
-	\item To allow members to contribute storage/compute nodes
-	\item Resilience: for availability \& the sysadmins' sleep 
-	\item Conceptual simplicity to ease onboarding \& demistify hosting
-\end{itemize}
-\end{block}
-
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The lacking state of the practice}
-
-\begin{block}{Object storage fitted our needs}
-\begin{itemize}
-	\item Distributed by design
-	\item Objects are replicated
-	\item Conceptually simple
-\end{itemize}
-\end{block}
-\vfill 
-
-\begin{block}{Existing object stores did not}
-	\begin{itemize}
-		\item Too specific / complex 
-		\item Resource hungry 
-		\item Hidden constraints 
-	\end{itemize}
-\end{block}
-\vfill
-
-We developed Garage, an object store with minimal functionality.
-
-It works, and serves our static sites and media.
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Introducing Garage}
-
-\centering
-\url{garagehq.deuxfleurs.fr}
-
-\url{git.deuxfleurs.fr/Deuxfleurs/garage}
-
-\includegraphics[width=.4\columnwidth]{figures/garage_distributed.png}
-\vfill
-
-\raggedright
-\begin{itemize}
-	\item Distributed data store
-	\item Based on DynamoDB object store (P2P!)
-	\item Modular data types/protocols with CRDTs:
-	\begin{itemize}
-		\item Done: objects (media, static sites, backups...) via S3 API 
-		\item To do: e-mails via IMAP protocol, and more
-	\end{itemize}
-\end{itemize}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[t]{The \textbf{RING}}
-
-\centering
-\fullcite{decandia_dynamo:_2007}
-\vspace{3ex}
-
-\only<1>{\includegraphics[width=.5\columnwidth]{figures/c1.pdf}}%
-\only<2>{\includegraphics[width=.5\columnwidth]{figures/c2.pdf}}%
-\only<3>{\includegraphics[width=.5\columnwidth]{figures/c3.pdf}}%
-\only<4>{\includegraphics[width=.5\columnwidth]{figures/c4.pdf}}%
-\vspace{5ex}
-
-%\raggedright
-\only<1>{Each node is assigned a unique ID on the circular address space.}%
-\only<2-3>{When a new object is added to the store...}%
-\only<3>{\\ It is assigned a unique ID (its \emph{key}) on the address space.}%
-\only<4>{The $R$ nodes after the object are in charge of replicating it.}%
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Distributed metadata}
-
-\centering
-\includegraphics[width=.8\columnwidth]{figures/garage_tables.pdf}
-\vfill
-
-The objects, versions and blocks are all stored in the ring.
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Written in Rust}
-
-\begin{columns}
-\column{.65\columnwidth}
-Entirely written in Rust!
-\column{.35\columnwidth}
-\centering
-\includegraphics[width=.85\columnwidth]{figures/rustacean-flat-happy.png}
-\end{columns}
-\vfill
-
-\begin{columns}
-\column[t]{.6\columnwidth}
-	\textbf{Pros:}
-	\begin{itemize}
-		\item Compiled and fast
-		\item Features prevent usual mistakes:
-
-		strongly typed, immutable by default, ownership instead of GC...
-
-		\item Best of several paradigms:
-
-		imperative, OO, functional
-
-		\item Good libraries for network programmings:
-
-		serialization, http, async/await...
-	\end{itemize}
-\column[t]{.4\columnwidth}
-	\textbf{Cons}:
-	\begin{itemize}
-		\item Steep learning curve
-		\item Long compilation times
-		\item Compiler rage
-	\end{itemize}
-\end{columns}
-
-\end{frame}

doc/talks/2021-04-28_spirals-team/header.tex

@@ -1,134 +0,0 @@
-%% Imports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{graphicx}
-\usepackage[utf8]{inputenc}
-\usepackage{csquotes} % Elegant quotes (must be loaded before babel)
-\usepackage[english]{babel}
-\usepackage[T1]{fontenc}
-% \usepackage{amsfonts}
-% \usepackage{amssymb}
-%\usepackage{lmodern}
-\usepackage{iwona}
-\usepackage{color}
-\usepackage{xspace}
-\usepackage{amsmath}
-\usepackage{hanging}
-\usepackage{listings}
-\lstset{basicstyle=\scriptsize}
-\usepackage{tikz}
-\usepackage{tikzsymbols} % For emojis
-%\usepackage{setspace} % Activation disables footnoes
-\usepackage{perpage} % Reset footnote counter every page
-\MakePerPage{footnote}
-\usepackage{nameref} % For printing the sections' name
-\usepackage{hyperref}
-
-%% Biblio %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[style=alphabetic,giveninits=true,sorting=none,hyperref,backend=biber,maxnames=3]{biblatex}
-\addbibresource{bibliography.bib}
-
-%% Templating %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{pgf}
-\usepackage{xifthen, tikz}
-
-\usetheme{default} 
-
-\makeatletter
-
-
-%%% colors
-\definecolor{bleuroi}{RGB}{0, 8, 88}
-\definecolor{vertemeraude}{RGB}{0, 64, 44}
-\definecolor{lightgray}{RGB}{245,245,245}
-\definecolor{encre_de_chine}{RGB}{9,36,53}
-\definecolor{im_lost_in_your_eyes}{RGB}{110,138,159}
-\definecolor{metallic_grey}{RGB}{209,219,221}
-\definecolor{metallic_white}{RGB}{229,239,241}
-\definecolor{boss}{RGB}{229,72,27}
-\definecolor{toon_eyes}{RGB}{3,4,6}
-
-\setbeamercolor{frametitle}{bg=bleuroi,fg=white}
-\setbeamercolor*{normal text}{fg=toon_eyes,bg=white} 
-\setbeamercolor*{block title}{fg=white,bg=vertemeraude}
-\setbeamercolor*{block body}{fg=toon_eyes,bg=vertemeraude!5}
-\setbeamercolor{alerted text}{fg=vertemeraude}
-\setbeamercolor*{example text}{fg=toon_eyes,bg=white} 
-\setbeamercolor*{structure}{fg=bleuroi,bg=white}
-% sectionnavigation:
-\setbeamercolor*{section in head/foot}{fg=bleuroi,bg=white}
-
-% \let\oldtextbf\textbf
-% \renewcommand{\textbf}[1]{\textcolor{bleuroi}{\oldtextbf{#1}}}
-
-%%% Rounded boxes with no shading
-\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{%
-  color(0pt)=(upper.bg); color(2pt)=(upper.bg); color(4pt)=(upper.bg)}
-\setbeamertemplate{blocks}[rounded][shadow=false]
-
-%%% Who on Earth uses navigation bars?
-\setbeamertemplate{navigation symbols}{}
-
-
-%%% Headline with sections
-\setbeamertemplate{headline}
-{%
-  \begin{beamercolorbox}[wd=\paperwidth,dp=.5ex,ht=2ex]{section in head/foot}
-    \insertsectionnavigationhorizontal{\paperwidth}{\hskip0pt plus1fill}{\hskip0pt plus1fill}\par % Centered
-    %\insertsectionnavigationhorizontal{\paperwidth}{}{\hfill\hfill} % Left aligned
-  \end{beamercolorbox}%
-}
-% Set the colors of the section bar
-\usesectionheadtemplate
-  {\colorbox{fg}{\color{bg} \insertsectionhead}}
-  {\color{fg!40!bg} \insertsectionhead}
-
-% \newlength\lpg@linewd
-% \setbox0=\hbox{\strut}
-% \newlength\strutht \strutht\ht0
-% \newlength\strutdp \strutdp\dp0
-
-\setbeamertemplate{frametitle}
-{
-  \begin{beamercolorbox}[wd=\paperwidth,dp=1ex,ht=2.6ex,leftskip=.7cm,rightskip=.7cm]{frametitle}
-    %\vskip-1ex
-    %[wd=\lpg@linewd, ht=\strutht, dp=\strutdp]{frametitle}
-    %\vskip-.8ex\hskip0.7cm
-    %\vskip-.8ex
-    \usebeamerfont{frametitle}\strut\insertframetitle
-    \ifx\insertframesubtitle\@empty
-    \else
-    \hfill \usebeamerfont{framesubtitle}\strut\insertframesubtitle
-    \fi%
-  \end{beamercolorbox}
-}
-
-
-%%% Page numbering in footline
-\setbeamertemplate{footline}{
-\hbox{\begin{beamercolorbox}[wd=1\paperwidth,ht=2.5ex,dp=1ex,right]{framenumber in head/foot}%
-    \usebeamerfont{framenumber in head/foot}%
-    %\insertframenumber\space/\space\inserttotalframenumber\hspace{0.3em}
-    \insertframenumber\hspace{0.5em}
-\end{beamercolorbox}}}
-
-%%% Reduce foot citation size
-\renewcommand{\footnotesize}{\tiny}
-
-%%% Display footnotes (not working, still no footnotes)
-% \setbeamertemplate{footnote}{%
-%   \hangpara{2em}{1}%
-%   \makebox[2em][l]{\insertfootnotemark}\footnotesize\insertfootnotetext\par%
-% }
-
-
-\makeatother
-
-%% Commentaires %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\annote}[3]{{
-    \colorbox{#3}{\bfseries\sffamily\footnotesize\textcolor{white}{#2}}
-    \color{#3}
-    $\blacktriangleright$\textit{#1}$\blacktriangleleft$}
-}
-%% Uncomment for final version (removes notes)
-%\renewcommand{\annote}[3]{}
-
-\newcommand{\todo}[1]{\annote{#1}{TODO}{green}}

doc/talks/2021-04-28_spirals-team/introduction.tex

@@ -1,99 +0,0 @@
-\section{Introduction}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{A very casual motivation}
-
-
-\begin{center}
-\Large
-I want to host \textbf{resilient web services} with \textbf{acceptable performance} on commodity hardware behind \textbf{household networks}.
-\end{center}
-\vfill
-
-\begin{block}{Keywords}
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{itemize}
-		\item Decentralised networks
-		\item Edge computing
-	\end{itemize}
-\column{.5\columnwidth}
-	\begin{itemize}
-		\item Distributed storage
-		\item Privacy
-	\end{itemize}
-\end{columns}
-\end{block}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Context}
-
-\textbf{Resilience}: Ability to recover quickly from failures and changes.
-\vspace{1ex}
-
-Only achievable through distribution of the hosted applications across several physical locations.
-\vfill
-
-
-\begin{block}{Application = \textbf{computations} on \textbf{data}}
-\begin{itemize}
-	\item \textbf{Computation}: Stateless; easy to distribute \& orchestrate.
-	% where it is performed does not matter as long as the application's state is accessible R/W
-	%Computation units are "easy" to distribute and orchestrate.
-
-	\item \textbf{Data}: Stateful; hard to distribute \& full of trade-offs.
-\end{itemize}
-\end{block}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Concurrent writes example}{How to lose vaccines}
-
-\centering
-
-\includegraphics[width=.5\columnwidth]{figures/conflict_problem.pdf}
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The problem}
-
-% \textbf{Path dependency}: existing data stores are built for data centres.
-
-% $\implies$ They assume good inter-node connectivity.
-% \vfill
-
-\begin{center}
-\Large
-Can we design an available data store tailored for adverse network conditions?
-\end{center}
-	
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Maybe more framing of the context. What kind of data storage? Object vs Block vs what?
-% \begin{frame}{``Stateless'', ``serverless'', and the elephant in the room}
-
-% It seems easy to deploy \& administer web services nowadays ...
-
-% Because the inherent complexity is shadowed by proprietary ``cloud'' solutions.
-
-% The IT crowd can gloss over ``statelessness'' \emph{ad nauseam} ...
-
-% But storing \emph{state} remains an open research problem.
-
-% Data storage is either:
-
-% \begin{itemize}
-% 	\item A single point of failure;
-% 	\item Delegated to proprietary solutions;
-% 	\item Pain.
-% \end{itemize}
-
-% Today, we will review networked storage's history, and discuss open research questions.
-
-% \end{frame}

doc/talks/2021-04-28_spirals-team/main.tex

@@ -1,70 +0,0 @@
-\documentclass[compress]{beamer}
-
-\input{header.tex}
-
-%% Metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\title{Distributed object storage is centralised}
-\subtitle{A quest for autonomy in the modern hosting ecology}
-\author{Adrien Luxey}
-\date{Wednesday, 28th April, 2021}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Begin document %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{document}
-
-%% Title page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{
-\setbeamertemplate{footline}{} 
-\setbeamertemplate{headline}{} 
-\begin{frame}
-\titlepage
-\end{frame}
-}
-
-%% Contents %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\input{introduction.tex}
-\input{sota.tex}
-\input{escaping_the_cloud.tex}
-\input{garage.tex}
-\input{conclusion.tex}
-
-
-%% Bibliography %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% \begin{frame}
-% \large
-% \raggedright
-% Références
-
-% \printbibliography
-% \end{frame}
-
-%% Ending %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-{
-\setbeamertemplate{footline}{} 
-\setbeamertemplate{headline}{} 
-\begin{frame}
-\centering
-
-\vspace{1cm}
-\Large Thank you for your attention.
-
-\vspace{2cm}
-\large Now let's chat!
-
-\vspace{1cm}
-\raggedleft
-\includegraphics[width=.2\textwidth]{figures/m_proxy_gray.pdf}
-\end{frame}
-}
-
-%% Appendices %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% \appendix
-% \input{sprinkler_appendix.tex}
-% \input{cascade_appendix.tex}
-% \input{spores_appendix.tex}
-
-
-\end{document}

doc/talks/2021-04-28_spirals-team/sota.tex

@@ -1,323 +0,0 @@
-\section{State of the art}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{The CAP theorem}{Consistency vs. Availability}
-
-\begin{block}{Eric Brewer's theorem}
-``A shared-state system can have \textbf{at most two} of the following properties at any given time:
-
-\begin{itemize}
-	\item \textbf{C}onsistency
-	\item \textbf{A}vailability
-	\item \textbf{P}artition tolerance''
-\end{itemize}
-\end{block}
-
-
-\begin{center}
-\Large 
-Under network partitions, a distributed data store has to sacrifice either availability or consistency.
-\end{center}
-\vfill
-
-\begin{itemize}
-	\item \textbf{Consistency-first}: Abort incoming queries;
-	\item \textbf{Availability-first}: Return possibly stale data.
-\end{itemize}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Consistency-first: the ACID model}{Consistency vs. Availability}
-
-\textbf{Transaction}: unit of work within an ACID data store. 
-%Comprises multiple operations.
-%E.g. bank transfer.
-%E.g. a bank transfer from A to B is a transaction involving two operations: withdraw money from A & credit B with the same money amount. 
-\vfill
-
-\begin{itemize}
-	\item \textbf{\underline{A}tomicity}: Transactions either complete entirely or fail.
-
-	No transaction ever seen as in-progress.
-
-	\item \textbf{\underline{C}onsistency}: Transactions always generate a valid state.
-
-	The database maintains its invariants across transactions.
-
-	\item \textbf{\underline{I}solation}: Concurrent transactions are seen as sequential.
-
-	Transactions are serializable, or sequentially consistent.
-
-	\item \textbf{\underline{D}urability}: Committed transactions are never forgotten.
-\end{itemize}
-\vfill\centering
-
-Reads are fast, writes are slow.
-
-\vfill\raggedright
-
-Example: relational databases.
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[fragile]{Concurrent writes in ACID}{Consistency vs. Availability}
-
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{}
-		\begin{lstlisting}
-transaction AcqDoses(y):
-  x <- SELECT #vaccines;
-  UPDATE #vaccines = (x + y);
-		\end{lstlisting}
-	\end{block}
-	\vspace{5ex}
-
-	Supports compound operations.
-\column{.5\columnwidth}
-\centering
-\includegraphics[width=\columnwidth]{figures/conflict_acid.pdf}
-\end{columns}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Availability-first: the BASE model}{Consistency vs. Availability}
-
-
-Some apps prefer availability, e.g. Amazon products' reviews.
-\vfill 
-
-The BASE model trades Consistency \& Isolation for Availability.
-
-
-%Some applications do not care about strong consistency and prefer being highly available (e.g. Amazon's product reviews).
-
-%In order to achieve higher availability, the BASE model relaxes consistency constraints of the ACID model: "eventual consistency".
-\vfill
-
-\begin{itemize}
-	\item \textbf{\underline{B}asic \underline{A}vailability}: 
-	The data store thrives to be available.
-
-	\item \textbf{\underline{S}oft-state}: 
-	Replicas can disagree on the valid state.
-
-	\item \textbf{\underline{E}ventual consistency}: 
-	In the absence of write queries, 
-	the data store will eventually converge to a single valid state.
-\end{itemize}
-\vfill\centering
-
-Writes are fast, reads are slow.
-
-\vfill\raggedright
-
-Examples: key-value \& object stores.
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Concurrent writes in BASE}{Consistency vs. Availability}
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{Object}
-		\begin{itemize}
-			\item Unique key
-			\item Arbitrary value 
-			\item Metadata
-		\end{itemize}
-	\end{block}
-	\vspace{5ex} 
-
-	Conflict resolution = client's job!
-	\vspace{5ex}
-
-	No compound operations.
-\column{.5\columnwidth}
-	\centering
-	\includegraphics[width=\columnwidth]{figures/conflict_base.pdf}
-\end{columns}
-
-% KV storage is another example, distinction is minor here
-
-% Object = unique key, arbitrary value, metadata.
-
-% Object storage only provides semantics to investigate causal order of queries *for individual objects*. No compound operations, no transactions.
-
-% Much easier to distribute, and "scale-out".
-
-% Write is fast, read is slow (gotta collect all object versions).
-
-% \todo{vaccines example with BASE model}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{Strong Eventual Consistency w/ CRDTs}{Consistency vs. Availability}
-
-\centering\small
-
-\fullcite{defago_conflict-free_2011}
-
-\vfill\raggedright\normalsize
-
-\begin{block}{Strong Eventual Consistency (SEC)}
-	\begin{itemize}
-		\item CRDTs specify distributed operations
-		\item Conflicts will be solved according to specification
-		\item Proven \& bound eventual convergence
-	\end{itemize}
-\end{block}
-
-\vfill\centering
-\includegraphics[width=.5\columnwidth]{figures/crdt.pdf}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}[fragile]{Concurrent writes with CRDTs}{Consistency vs. Availability}
-
-\begin{columns}
-\column{.5\columnwidth}
-	\begin{block}{}
-		\begin{lstlisting}
-CRDT Counter(x0):
-  history = {}
-  op. incr(y):
-    history U= {(UUID(), y)}
-  op. decr(y):
-    history U= {(UUID(), -y)}
-  op. read():
-    x = x0
-    for (_, y) in history:
-    	x += y
-    return x
-		\end{lstlisting}
-	\end{block}
-	\vspace{2ex}
-
-	Operations commute?
-
-	$\implies$ screw total order!
-\column{.5\columnwidth}
-	\centering
-	\includegraphics[width=\columnwidth]{figures/conflict_crdt.pdf}
-\end{columns}
-
-\end{frame}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{A complex CRDT: the DAG}{Consistency vs. Availability}
-
-\centering
-\only<1>{\includegraphics[height=\textheight]{figures/dag_crdt.png}}%
-\only<2>{
-	Just to say I swept a lot under the rug.
-	\vfill
-
-	For details, go read:
-
-	\fullcite{defago_conflict-free_2011}
-	\vfill
-
-	For an implementation, check \textbf{AntidoteDB}.
-}
-
-\end{frame}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{frame}{State of the practice}{Path dependency to the ``cloud''}
-
-\begin{block}{The BASE model is fashionable because}
-\centering 
-
-``\emph{High-performance} object storage for \emph{AI analytics} with PBs of \emph{IoT data streams} at the \emph{edge}, using \emph{5G}.''
-	% \begin{itemize}
-	% 	\item Highest performance 
-	% 	\item IoT data streams are inherently distributed
-	% \end{itemize}
-\end{block}
-
-\vfill\centering
-
-\includegraphics[width=.9\columnwidth]{figures/minio_edge.png}
-
-\vfill\raggedright
-
-
-%\begin{block}{}
-\begin{itemize}
-	\item Always backed by cloud: high performance network links.
-	\item Edge nodes always seen as clients or data sources, not peers.
-\end{itemize}
-%\end{block}
-
-% There is \textbf{always a central cloud cluster} in these use-cases.
-
-% Hidden constraint: \textbf{high performance inter-node connectivity}.
-
-
-
-\end{frame}
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \begin{frame}{A brief history of storage}
-
-% We keep it short because we'll follow chronological order in the next section too.
-
-% \end{frame}
-
-
-% \begin{frame}{In the beginning, there were \emph{monoliths}}
-
-% \includegraphics[width=.5\columnwidth]{figures/stonehenge.jpg}
-
-% Web applications used to be monolithic:
-
-% \begin{itemize}
-% 	\item One or two servers;
-% 	\item Availability was not an obsession;
-% 	\item Latency was acceptable.
-% \end{itemize}
-
-% Relational databases were queens.
-
-% \end{frame}
-
-
-% \begin{frame}{Then came \emph{expectations}}
-% Then, the whole world went online, and suddenly: expectations!
-
-% \begin{itemize}
-% 	\item ``Milliseconds matter.'' (Algolia slogan)
-% 	\item Critical networked services (healthcare, logistics) need 100\% availability 
-% \end{itemize}
-
-% $\implies$ Microservices \& horizontal scalability.
-
-% \todo{Develop on the `herd not sheep' paradigm a bit.}
-
-% \end{frame}
-
-
-% \begin{frame}{Distributing state/storage: the remaining unknown}
-
-% The microservices orchestration game works well for \emph{stateless} services.
-
-% However, any application requires \emph{state}, persistent data. 
-
-% And this is tough. As we will now see.
-
-% (Not that it's not well studied: distributed storage has always been fashionable.)
-	
-% \end{frame}

make_docker.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-BIN=target/release/garage
-DOCKER=lxpz/garage_amd64
-
-TAG=$1
-if [ -z "$1" ]; then
-	echo "Usage: $0 <tag>"
-	exit 1
-fi
-
-RUSTFLAGS="-C link-arg=-fuse-ld=lld -C target-cpu=x86-64 -C target-feature=+sse2" cargo build --release --no-default-features
-cp $BIN $BIN.stripped
-strip $BIN.stripped
-
-docker pull archlinux:latest
-docker build -t $DOCKER:$TAG .
-docker push $DOCKER:$TAG
-docker tag $DOCKER:$TAG $DOCKER:latest
-docker push $DOCKER:latest

script/builder_image/Dockerfile

@@ -1,7 +1,6 @@
 FROM rust:buster
 RUN apt-get update && \
-	apt-get install --yes libsodium-dev awscli python-pip wget rclone openssl socat && \
+	apt-get install --yes libsodium-dev awscli python-pip && \
 	    rm -rf /var/lib/apt/lists/*
-RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc && chmod +x /usr/local/bin/mc
+RUN rustup component add rustfmt
-RUN rustup component add rustfmt clippy
 RUN pip install s3cmd

script/dev-clean.sh

@@ -3,6 +3,5 @@
 set -ex
 
 killall -9 garage || echo "garage is not running"
-killall -9 socat || echo "socat is not running"
 rm -rf /tmp/garage*
 rm -rf /tmp/config.*.toml

script/dev-cluster.sh

@@ -31,7 +31,12 @@ bootstrap_peers = [
   "127.0.0.1:3903"
 ]
 max_concurrent_rpc_requests = 12
-replication_mode = "3"
+data_replication_factor = 3
+meta_replication_factor = 3
+meta_epidemic_fanout = 3
+
+enable_compression = true
+compressin_level = 10
 
 [s3_api]
 api_bind_addr = "0.0.0.0:$((3910+$count))"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
@@ -45,21 +50,6 @@ EOF
 
 echo -en "$LABEL configuration written to $CONF_PATH\n"
 
-if [ -z "$SKIP_HTTPS" ]; then
-  echo -en "$LABEL Starting dummy HTTPS reverse proxy\n"
-  mkdir -p /tmp/garagessl
-  openssl req \
-    -new \
-    -x509 \
-    -keyout /tmp/garagessl/test.key \
-    -out /tmp/garagessl/test.crt \
-    -nodes  \
-    -subj "/C=XX/ST=XX/L=XX/O=XX/OU=XX/CN=localhost/emailAddress=X@X.XX" \
-    -addext "subjectAltName = DNS:localhost, IP:127.0.0.1"
-  cat /tmp/garagessl/test.key /tmp/garagessl/test.crt > /tmp/garagessl/test.pem
-  socat openssl-listen:4443,reuseaddr,fork,cert=/tmp/garagessl/test.pem,verify=0 tcp4-connect:localhost:3911 &
-fi
-
 (garage server -c /tmp/config.$count.toml 2>&1|while read r; do echo -en "$LABEL $r\n"; done) &
 done
 

script/dev-configure.sh

@@ -18,6 +18,6 @@ garage status \
 	| grep UNCONFIGURED \
 	| grep -Po '^[0-9a-f]+' \
 	| while read id; do 
-	  garage node configure -z dc1 -c 1 $id
+	  garage node configure -d dc1 -c 1 $id
 	done
 

script/dev-env-aws.sh

@@ -1,9 +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'
 
-function aws { command aws --endpoint-url http://127.0.0.1:3911 $@ ; }
+alias awsgrg="aws s3 \
-
+  --endpoint-url http://127.0.0.1:3911"
-aws --version

script/dev-env-duck.sh

@@ -1,52 +0,0 @@
-mkdir -p /tmp/garage.cyberduck.home/.duck/profiles
-
-DUCK_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1`
-DUCK_SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-
-cat > /tmp/garage.cyberduck.home/.duck/credentials <<EOF
-https\://$DUCK_ACCESS_KEY@127.0.0.1\:4443=$DUCK_SECRET_KEY
-EOF
-
-cat > /tmp/garage.cyberduck.home/.duck/profiles/garage.cyberduckprofile <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Protocol</key>
-        <string>s3</string>
-        <key>Vendor</key>
-        <string>garage</string>
-        <key>Scheme</key>
-        <string>https</string>
-        <key>Description</key>
-        <string>GarageS3</string>
-        <key>Default Hostname</key>
-        <string>127.0.0.1</string>
-        <key>Default Port</key>
-        <string>4443</string>
-        <key>Hostname Configurable</key>
-        <false/>
-        <key>Port Configurable</key>
-        <false/>
-        <key>Username Configurable</key>
-        <true/>
-        <key>Username Placeholder</key>
-        <string>Access Key ID (GK...)</string>
-        <key>Password Placeholder</key>
-        <string>Secret Key</string>
-        <key>Properties</key>
-        <array>
-            <string>s3service.disable-dns-buckets=true</string>
-        </array>
-        <key>Region</key>
-        <string>garage</string>
-        <key>Regions</key>
-        <array>
-            <string>garage</string>
-        </array>
-    </dict>
-</plist>
-EOF
-
-function duck { HOME=/tmp/garage.cyberduck.home/ command duck --username $DUCK_ACCESS_KEY $@ ; }
-

script/dev-env-mc.sh

@@ -1,22 +0,0 @@
-ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1`
-SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-
-mkdir -p /tmp/garage.mc/certs/CAs
-
-cat > /tmp/garage.mc/config.json <<EOF
-{
-  "version": "10",
-  "aliases": {
-    "garage": {
-      "url": "https://localhost:4443",
-      "accessKey": "$ACCESS_KEY",
-      "secretKey": "$SECRET_KEY",
-      "api": "S3v4",
-      "path": "auto"
-    }
-  }
-}
-EOF
-
-function mc { command mc --insecure --config-dir /tmp/garage.mc $@ ; }
-mc --version

script/dev-env-rclone.sh

@@ -1,21 +0,0 @@
-ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1`
-SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-
-cat > /tmp/garage.rclone.conf <<EOF
-[garage]
-type = s3
-provider = Other
-env_auth = false
-access_key_id = $ACCESS_KEY
-secret_access_key = $SECRET_KEY
-endpoint = http://127.0.0.1:3911
-bucket_acl = private
-force_path_style = true
-region = garage
-no_check_bucket = true
-EOF
-# It seems that region is mandatory as rclone does not support redirection
-
-
-function rclone { command rclone --config /tmp/garage.rclone.conf $@ ; }
-rclone --version

script/dev-env-s3cmd.sh

@@ -1,15 +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`
 
-cat > /tmp/garage.s3cmd.cfg <<EOF
+alias s3grg="s3cmd \
-[default]
+  --host 127.0.0.1:3911 \
-access_key = $ACCESS_KEY
+  --host-bucket 127.0.0.1:3911 \
-secret_key = $SECRET_KEY
+  --access_key=$ACCESS_KEY \
-host_base = 127.0.0.1:3911
+  --secret_key=$SECRET_KEY \
-host_bucket = 127.0.0.1:3911
+  --region=garage \
-use_https = False
+  --no-ssl"
-EOF
 
-function s3cmd { command s3cmd --config=/tmp/garage.s3cmd.cfg $@ ; }
-s3cmd --version
-python3 --version

script/test-smoke.sh

@@ -1,134 +1,80 @@
 #!/bin/bash
 
 set -ex
+shopt -s expand_aliases
 
-export LC_ALL=C.UTF-8
-export LANG=C.UTF-8
 SCRIPT_FOLDER="`dirname \"$0\"`"
 REPO_FOLDER="${SCRIPT_FOLDER}/../"
-GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
-GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
-PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 
-# @FIXME Duck is not ready for testing, we have a bug
+echo "setup"
-SKIP_DUCK=1
-
-echo "⏳ Setup"
 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-aws.sh
+source ${SCRIPT_FOLDER}/dev-env-s3cmd.sh
 
-which garage
 garage status
 garage key list
 garage bucket list
 
-dd if=/dev/urandom of=/tmp/garage.1.rnd bs=1k count=2 # No multipart, inline storage (< INLINE_THRESHOLD = 3072 bytes)
+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 # No multipart but file will be chunked
+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 # by default, AWS starts using multipart at 8MB
+dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10
 
-echo "🧪 S3 API testing..."
+dd if=/dev/urandom bs=1k count=2  | base64 -w0 > /tmp/garage.1.b64
+dd if=/dev/urandom bs=1M count=5  | base64 -w0 > /tmp/garage.2.b64
+dd if=/dev/urandom bs=1M count=10 | base64 -w0 > /tmp/garage.3.b64
 
-# AWS
+echo "s3 api testing..."
-if [ -z "$SKIP_AWS" ]; then
+for idx in {1,2,3}.{rnd,b64}; do
-  echo "🛠️ Testing with awscli"
+  # AWS sends	
-  source ${SCRIPT_FOLDER}/dev-env-aws.sh
+  awsgrg cp /tmp/garage.$idx s3://eprouvette/garage.$idx.aws
-  aws s3 ls
+  
-  for idx in $(seq 1 3); do
+  awsgrg ls s3://eprouvette
-    aws s3 cp "/tmp/garage.$idx.rnd" "s3://eprouvette/&+-é\"/garage.$idx.aws"
+  
-    aws s3 ls s3://eprouvette
+  awsgrg cp s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl
-    aws s3 cp "s3://eprouvette/&+-é\"/garage.$idx.aws" "/tmp/garage.$idx.dl"
+  diff /tmp/garage.$idx /tmp/garage.$idx.dl
-    diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+  rm /tmp/garage.$idx.dl
-    rm /tmp/garage.$idx.dl
+  
-    aws s3 rm "s3://eprouvette/&+-é\"/garage.$idx.aws"
+  s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl
-  done
+  diff /tmp/garage.$idx /tmp/garage.$idx.dl
-fi
+  rm /tmp/garage.$idx.dl
+  
+  awsgrg rm s3://eprouvette/garage.$idx.aws
 
-# S3CMD
+  # S3CMD sends
-if [ -z "$SKIP_S3CMD" ]; then
+  s3grg put /tmp/garage.$idx s3://eprouvette/garage.$idx.s3cmd
-  echo "🛠️ Testing with s3cmd"
-  source ${SCRIPT_FOLDER}/dev-env-s3cmd.sh
-  s3cmd ls
-  for idx in $(seq 1 3); do
-    s3cmd put "/tmp/garage.$idx.rnd" "s3://eprouvette/&+-é\"/garage.$idx.s3cmd"
-    s3cmd ls s3://eprouvette
-    s3cmd get "s3://eprouvette/&+-é\"/garage.$idx.s3cmd" "/tmp/garage.$idx.dl"
-    diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
-    rm /tmp/garage.$idx.dl
-    s3cmd rm "s3://eprouvette/&+-é\"/garage.$idx.s3cmd"
-  done
-fi
 
-# Minio Client
+  s3grg ls s3://eprouvette
-if [ -z "$SKIP_MC" ]; then
+	
-  echo "🛠️ Testing with mc (minio client)"
+  s3grg get s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl
-  source ${SCRIPT_FOLDER}/dev-env-mc.sh
+  diff /tmp/garage.$idx /tmp/garage.$idx.dl
-  mc ls garage/
+  rm /tmp/garage.$idx.dl
-  for idx in $(seq 1 3); do
+  
-    mc cp "/tmp/garage.$idx.rnd" "garage/eprouvette/&+-é\"/garage.$idx.mc"
+  awsgrg cp s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl
-    mc ls garage/eprouvette
+  diff /tmp/garage.$idx /tmp/garage.$idx.dl
-    mc cp "garage/eprouvette/&+-é\"/garage.$idx.mc" "/tmp/garage.$idx.dl"
+  rm /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
-    mc rm "garage/eprouvette/&+-é\"/garage.$idx.mc"
+done
-  done
+rm /tmp/garage.{1,2,3}.{rnd,b64}
-fi
 
-# RClone
+echo "website testing"
-if [ -z "$SKIP_RCLONE" ]; then
+echo "<h1>hello world</h1>" > /tmp/garage-index.html
-  echo "🛠️ Testing with rclone"
+awsgrg cp /tmp/garage-index.html s3://eprouvette/index.html
-  source ${SCRIPT_FOLDER}/dev-env-rclone.sh
+[ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-  rclone lsd garage:
+garage bucket website --allow eprouvette
-  for idx in $(seq 1 3); do
+[ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 200 ]
-    cp /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+garage bucket website --deny eprouvette
-    rclone copy "/tmp/garage.$idx.dl" "garage:eprouvette/&+-é\"/"
+[ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-    rm /tmp/garage.$idx.dl
+awsgrg rm s3://eprouvette/index.html
-    rclone ls garage:eprouvette
+rm /tmp/garage-index.html
-    rclone copy "garage:eprouvette/&+-é\"/garage.$idx.dl" "/tmp/"
-    diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
-    rm /tmp/garage.$idx.dl
-    rclone delete "garage:eprouvette/&+-é\"/garage.$idx.dl"
-  done
-fi
 
-# Duck (aka Cyberduck CLI)
+echo "teardown"
-if [ -z "$SKIP_DUCK" ]; then
-  echo "🛠️ Testing with duck (aka cyberduck cli)"
-  source ${SCRIPT_FOLDER}/dev-env-duck.sh
-  duck --list garage:/
-  duck --mkdir "garage:/eprouvette/duck"
-  for idx in $(seq 1 3); do
-    duck --verbose --upload "garage:/eprouvette/duck/" "/tmp/garage.$idx.rnd" 
-    duck --list garage:/eprouvette/duck/
-    duck --download "garage:/eprouvette/duck/garage.$idx.rnd" "/tmp/garage.$idx.dl"
-    diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
-    rm /tmp/garage.$idx.dl
-    duck --delete "garage:/eprouvette/duck/garage.$idx.dk"
-  done
-fi
-
-rm /tmp/garage.{1,2,3}.rnd
-
-if [ -z "$SKIP_AWS" ]; then
-  echo "🧪 Website Testing"
-  echo "<h1>hello world</h1>" > /tmp/garage-index.html
-  aws s3 cp /tmp/garage-index.html s3://eprouvette/index.html
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-  garage bucket website --allow eprouvette
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 200 ]
-  garage bucket website --deny eprouvette
-  [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-  aws s3 rm s3://eprouvette/index.html
-  rm /tmp/garage-index.html
-fi
-
-echo "🏁 Teardown"
-AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
-AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
 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"
+echo "success"

src/api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "0.3.0"
+version = "0.2.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,19 +13,21 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_model = { version = "0.3.0", path = "../model" }
+garage_model = { version = "0.2.1", path = "../model" }
-garage_table = { version = "0.3.0", path = "../table" }
+garage_table = { version = "0.2.1", path = "../table" }
-garage_util = { version = "0.3.0", path = "../util" }
+garage_util = { version = "0.2.1", path = "../util" }
 
 base64 = "0.13"
 bytes = "1.0"
 chrono = "0.4"
 crypto-mac = "0.10"
 err-derive = "0.3"
+fastcdc = "1.0.5"
 hex = "0.4"
 hmac = "0.10"
 log = "0.4"
 md-5 = "0.9"
+rand = "0.7"
 sha2 = "0.9"
 
 futures = "0.3"
@@ -38,6 +40,4 @@ http-range = "0.1"
 hyper = "0.14"
 percent-encoding = "2.1.0"
 roxmltree = "0.14"
-serde = { version = "1.0", features = ["derive"] }
-quick-xml = { version = "0.21", features = [ "serialize" ] }
 url = "2.1"

src/api/api_server.rs

@@ -14,7 +14,6 @@ use garage_model::garage::Garage;
 use crate::error::*;
 use crate::signature::check_signature;
 
-use crate::s3_bucket::*;
 use crate::s3_copy::*;
 use crate::s3_delete::*;
 use crate::s3_get::*;
@@ -53,21 +52,17 @@ async fn handler(
 	req: Request<Body>,
 	addr: SocketAddr,
 ) -> Result<Response<Body>, GarageError> {
-	let uri = req.uri().clone();
+	info!("{} {} {}", addr, req.method(), req.uri());
-	info!("{} {} {}", addr, req.method(), uri);
 	debug!("{:?}", req);
-	match handler_inner(garage.clone(), req).await {
+	match handler_inner(garage, req).await {
 		Ok(x) => {
 			debug!("{} {:?}", x.status(), x.headers());
 			Ok(x)
 		}
 		Err(e) => {
-			let body: Body = Body::from(e.aws_xml(&garage.config.s3_api.s3_region, uri.path()));
+			let body: Body = Body::from(format!("{}\n", e));
-			let http_error = Response::builder()
+			let mut http_error = Response::new(body);
-				.status(e.http_status_code())
+			*http_error.status_mut() = e.http_status_code();
-				.header("Content-Type", "application/xml")
-				.body(body)?;
-
 			if e.http_status_code().is_server_error() {
 				warn!("Response: error {}, {}", e.http_status_code(), e);
 			} else {
@@ -81,20 +76,18 @@ async fn handler(
 async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Response<Body>, Error> {
 	let path = req.uri().path().to_string();
 	let path = percent_encoding::percent_decode_str(&path).decode_utf8()?;
-	let (api_key, content_sha256) = check_signature(&garage, &req).await?;
-	if path == "/" {
-		return handle_list_buckets(&api_key);
-	}
 
 	let (bucket, key) = parse_bucket_key(&path)?;
+
+	let (api_key, content_sha256) = check_signature(&garage, &req).await?;
 	let allowed = match req.method() {
 		&Method::HEAD | &Method::GET => api_key.allow_read(&bucket),
 		_ => api_key.allow_write(&bucket),
 	};
 	if !allowed {
-		return Err(Error::Forbidden(
+		return Err(Error::Forbidden(format!(
-			"Operation is not allowed for this key.".to_string(),
+			"Operation is not allowed for this key."
-		));
+		)));
 	}
 
 	let mut params = HashMap::new();
@@ -106,16 +99,16 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 	}
 
 	if let Some(key) = key {
-		match *req.method() {
+		match req.method() {
-			Method::HEAD => {
+			&Method::HEAD => {
 				// HeadObject query
 				Ok(handle_head(garage, &req, &bucket, &key).await?)
 			}
-			Method::GET => {
+			&Method::GET => {
 				// GetObject query
 				Ok(handle_get(garage, &req, &bucket, &key).await?)
 			}
-			Method::PUT => {
+			&Method::PUT => {
 				if params.contains_key(&"partnumber".to_string())
 					&& params.contains_key(&"uploadid".to_string())
 				{
@@ -154,7 +147,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 					Ok(handle_put(garage, req, &bucket, &key, content_sha256).await?)
 				}
 			}
-			Method::DELETE => {
+			&Method::DELETE => {
 				if params.contains_key(&"uploadid".to_string()) {
 					// AbortMultipartUpload query
 					let upload_id = params.get("uploadid").unwrap();
@@ -164,7 +157,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 					Ok(handle_delete(garage, &bucket, &key).await?)
 				}
 			}
-			Method::POST => {
+			&Method::POST => {
 				if params.contains_key(&"uploads".to_string()) {
 					// CreateMultipartUpload call
 					Ok(handle_create_multipart_upload(garage, &req, &bucket, &key).await?)
@@ -181,16 +174,16 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 					)
 					.await?)
 				} else {
-					Err(Error::BadRequest(
+					Err(Error::BadRequest(format!(
-						"Not a CreateMultipartUpload call, what is it?".to_string(),
+						"Not a CreateMultipartUpload call, what is it?"
-					))
+					)))
 				}
 			}
-			_ => Err(Error::BadRequest("Invalid method".to_string())),
+			_ => Err(Error::BadRequest(format!("Invalid method"))),
 		}
 	} else {
-		match *req.method() {
+		match req.method() {
-			Method::PUT => {
+			&Method::PUT => {
 				// CreateBucket
 				// If we're here, the bucket already exists, so just answer ok
 				debug!(
@@ -205,32 +198,24 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 					.unwrap();
 				Ok(response)
 			}
-			Method::HEAD => {
+			&Method::HEAD => {
 				// HeadBucket
 				let empty_body: Body = Body::from(vec![]);
 				let response = Response::builder().body(empty_body).unwrap();
 				Ok(response)
 			}
-			Method::DELETE => {
+			&Method::DELETE => {
 				// DeleteBucket query
 				Err(Error::Forbidden(
 					"Cannot delete buckets using S3 api, please talk to Garage directly".into(),
 				))
 			}
-			Method::GET => {
+			&Method::GET => {
-				if params.contains_key("location") {
+				// ListObjects or ListObjectsV2 query
-					// GetBucketLocation call
+				let q = parse_list_objects_query(bucket, &params)?;
-					Ok(handle_get_bucket_location(garage)?)
+				Ok(handle_list(garage, &q).await?)
-				} else if params.contains_key("versioning") {
-					// GetBucketVersioning
-					Ok(handle_get_bucket_versioning()?)
-				} else {
-					// ListObjects or ListObjectsV2 query
-					let q = parse_list_objects_query(bucket, &params)?;
-					Ok(handle_list(garage, &q).await?)
-				}
 			}
-			Method::POST => {
+			&Method::POST => {
 				if params.contains_key(&"delete".to_string()) {
 					// DeleteObjects
 					Ok(handle_delete_objects(garage, bucket, req, content_sha256).await?)
@@ -240,10 +225,10 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
 						std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?)
 							.unwrap_or("<invalid utf8>")
 					);
-					Err(Error::BadRequest("Unsupported call".to_string()))
+					Err(Error::BadRequest(format!("Unsupported call")))
 				}
 			}
-			_ => Err(Error::BadRequest("Invalid method".to_string())),
+			_ => Err(Error::BadRequest(format!("Invalid method"))),
 		}
 	}
 }
@@ -258,7 +243,7 @@ fn parse_bucket_key(path: &str) -> Result<(&str, Option<&str>), Error> {
 	let (bucket, key) = match path.find('/') {
 		Some(i) => {
 			let key = &path[i + 1..];
-			if !key.is_empty() {
+			if key.len() > 0 {
 				(&path[..i], Some(key))
 			} else {
 				(&path[..i], None)
@@ -266,8 +251,8 @@ fn parse_bucket_key(path: &str) -> Result<(&str, Option<&str>), Error> {
 		}
 		None => (path, None),
 	};
-	if bucket.is_empty() {
+	if bucket.len() == 0 {
-		return Err(Error::BadRequest("No bucket specified".to_string()));
+		return Err(Error::BadRequest(format!("No bucket specified")));
 	}
 	Ok((bucket, key))
 }

src/api/encoding.rs

@@ -1,5 +1,12 @@
 //! Module containing various helpers for encoding
 
+/// Escape &str for xml inclusion
+pub fn xml_escape(s: &str) -> String {
+	s.replace("<", "&lt;")
+		.replace(">", "&gt;")
+		.replace("\"", "&quot;")
+}
+
 /// Encode &str for use in a URI
 pub fn uri_encode(string: &str, encode_slash: bool) -> String {
 	let mut result = String::with_capacity(string.len() * 2);
@@ -20,3 +27,12 @@ pub fn uri_encode(string: &str, encode_slash: bool) -> String {
 	}
 	result
 }
+
+/// Encode &str either as an uri, or a valid string for xml inclusion
+pub fn xml_encode_key(k: &str, urlencode: bool) -> String {
+	if urlencode {
+		uri_encode(k, true)
+	} else {
+		xml_escape(k)
+	}
+}

src/api/error.rs

@@ -3,8 +3,6 @@ use hyper::StatusCode;
 
 use garage_util::error::Error as GarageError;
 
-use crate::s3_xml;
-
 /// Errors of this crate
 #[derive(Debug, Error)]
 pub enum Error {
@@ -19,17 +17,13 @@ pub enum Error {
 
 	/// Error related to HTTP
 	#[error(display = "Internal error (HTTP error): {}", _0)]
-	Http(#[error(source)] http::Error),
+	HTTP(#[error(source)] http::Error),
 
 	// Category: cannot process
 	/// No proper api key was used, or the signature was invalid
 	#[error(display = "Forbidden: {}", _0)]
 	Forbidden(String),
 
-	/// Authorization Header Malformed
-	#[error(display = "Authorization header malformed, expected scope: {}", _0)]
-	AuthorizationHeaderMalformed(String),
-
 	/// The object requested don't exists
 	#[error(display = "Not found")]
 	NotFound,
@@ -37,11 +31,11 @@ pub enum Error {
 	// Category: bad request
 	/// The request contained an invalid UTF-8 sequence in its path or in other parameters
 	#[error(display = "Invalid UTF-8: {}", _0)]
-	InvalidUtf8Str(#[error(source)] std::str::Utf8Error),
+	InvalidUTF8Str(#[error(source)] std::str::Utf8Error),
 
 	/// The request used an invalid path
 	#[error(display = "Invalid UTF-8: {}", _0)]
-	InvalidUtf8String(#[error(source)] std::string::FromUtf8Error),
+	InvalidUTF8String(#[error(source)] std::string::FromUtf8Error),
 
 	/// Some base64 encoded data was badly encoded
 	#[error(display = "Invalid base64: {}", _0)]
@@ -49,7 +43,7 @@ pub enum Error {
 
 	/// The client sent invalid XML data
 	#[error(display = "Invalid XML: {}", _0)]
-	InvalidXml(String),
+	InvalidXML(String),
 
 	/// The client sent a header with invalid value
 	#[error(display = "Invalid header value: {}", _0)]
@@ -66,13 +60,7 @@ pub enum Error {
 
 impl From<roxmltree::Error> for Error {
 	fn from(err: roxmltree::Error) -> Self {
-		Self::InvalidXml(format!("{}", err))
+		Self::InvalidXML(format!("{}", err))
-	}
-}
-
-impl From<quick_xml::de::DeError> for Error {
-	fn from(err: quick_xml::de::DeError) -> Self {
-		Self::InvalidXml(format!("{}", err))
 	}
 }
 
@@ -82,43 +70,13 @@ impl Error {
 		match self {
 			Error::NotFound => StatusCode::NOT_FOUND,
 			Error::Forbidden(_) => StatusCode::FORBIDDEN,
-			Error::InternalError(GarageError::Rpc(_)) => StatusCode::SERVICE_UNAVAILABLE,
+			Error::InternalError(GarageError::RPC(_)) => StatusCode::SERVICE_UNAVAILABLE,
-			Error::InternalError(_) | Error::Hyper(_) | Error::Http(_) => {
+			Error::InternalError(_) | Error::Hyper(_) | Error::HTTP(_) => {
 				StatusCode::INTERNAL_SERVER_ERROR
 			}
 			_ => StatusCode::BAD_REQUEST,
 		}
 	}
-
-	pub fn aws_code(&self) -> &'static str {
-		match self {
-			Error::NotFound => "NoSuchKey",
-			Error::Forbidden(_) => "AccessDenied",
-			Error::AuthorizationHeaderMalformed(_) => "AuthorizationHeaderMalformed",
-			Error::InternalError(GarageError::Rpc(_)) => "ServiceUnavailable",
-			Error::InternalError(_) | Error::Hyper(_) | Error::Http(_) => "InternalError",
-			_ => "InvalidRequest",
-		}
-	}
-
-	pub fn aws_xml(&self, garage_region: &str, path: &str) -> String {
-		let error = s3_xml::Error {
-			code: s3_xml::Value(self.aws_code().to_string()),
-			message: s3_xml::Value(format!("{}", self)),
-			resource: Some(s3_xml::Value(path.to_string())),
-			region: Some(s3_xml::Value(garage_region.to_string())),
-		};
-		s3_xml::to_xml_with_header(&error).unwrap_or_else(|_| {
-			r#"
-<?xml version="1.0" encoding="UTF-8"?>
-<Error>
-	<Code>InternalError</Code>
-	<Message>XML encoding of error failed</Message>
-</Error>
-			"#
-			.into()
-		})
-	}
 }
 
 /// Trait to map error to the Bad Request error code
@@ -145,7 +103,7 @@ impl<T> OkOrBadRequest for Option<T> {
 	fn ok_or_bad_request(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Some(x) => Ok(x),
-			None => Err(Error::BadRequest(reason.to_string())),
+			None => Err(Error::BadRequest(format!("{}", reason))),
 		}
 	}
 }
@@ -177,9 +135,10 @@ impl<T> OkOrInternalError for Option<T> {
 	fn ok_or_internal_error(self, reason: &'static str) -> Result<T, Error> {
 		match self {
 			Some(x) => Ok(x),
-			None => Err(Error::InternalError(GarageError::Message(
+			None => Err(Error::InternalError(GarageError::Message(format!(
-				reason.to_string(),
+				"{}",
-			))),
+				reason
+			)))),
 		}
 	}
 }

src/api/lib.rs

@@ -12,10 +12,8 @@ pub use api_server::run_api_server;
 
 mod signature;
 
-mod s3_bucket;
 mod s3_copy;
 mod s3_delete;
 pub mod s3_get;
 mod s3_list;
 mod s3_put;
-mod s3_xml;

src/api/s3_bucket.rs

@@ -1,62 +0,0 @@
-use std::sync::Arc;
-
-use hyper::{Body, Response};
-
-use garage_model::garage::Garage;
-use garage_model::key_table::Key;
-use garage_util::time::*;
-
-use crate::error::*;
-use crate::s3_xml;
-
-pub fn handle_get_bucket_location(garage: Arc<Garage>) -> Result<Response<Body>, Error> {
-	let loc = s3_xml::LocationConstraint {
-		xmlns: (),
-		region: garage.config.s3_api.s3_region.to_string(),
-	};
-	let xml = s3_xml::to_xml_with_header(&loc)?;
-
-	Ok(Response::builder()
-		.header("Content-Type", "application/xml")
-		.body(Body::from(xml.into_bytes()))?)
-}
-
-pub fn handle_get_bucket_versioning() -> Result<Response<Body>, Error> {
-	let versioning = s3_xml::VersioningConfiguration {
-		xmlns: (),
-		status: None,
-	};
-
-	let xml = s3_xml::to_xml_with_header(&versioning)?;
-
-	Ok(Response::builder()
-		.header("Content-Type", "application/xml")
-		.body(Body::from(xml.into_bytes()))?)
-}
-
-pub fn handle_list_buckets(api_key: &Key) -> Result<Response<Body>, Error> {
-	let list_buckets = s3_xml::ListAllMyBucketsResult {
-		owner: s3_xml::Owner {
-			display_name: s3_xml::Value(api_key.name.get().to_string()),
-			id: s3_xml::Value(api_key.key_id.to_string()),
-		},
-		buckets: s3_xml::BucketList {
-			entries: api_key
-				.authorized_buckets
-				.items()
-				.iter()
-				.map(|(name, ts, _)| s3_xml::Bucket {
-					creation_date: s3_xml::Value(msec_to_rfc3339(*ts)),
-					name: s3_xml::Value(name.to_string()),
-				})
-				.collect(),
-		},
-	};
-
-	let xml = s3_xml::to_xml_with_header(&list_buckets)?;
-	trace!("xml: {}", xml);
-
-	Ok(Response::builder()
-		.header("Content-Type", "application/xml")
-		.body(Body::from(xml))?)
-}

src/api/s3_copy.rs

@@ -1,3 +1,4 @@
+use std::fmt::Write;
 use std::sync::Arc;
 
 use hyper::{Body, Request, Response};
@@ -13,7 +14,6 @@ use garage_model::version_table::*;
 
 use crate::error::*;
 use crate::s3_put::get_headers;
-use crate::s3_xml;
 
 pub async fn handle_copy(
 	garage: Arc<Garage>,
@@ -33,7 +33,8 @@ pub async fn handle_copy(
 		.versions()
 		.iter()
 		.rev()
-		.find(|v| v.is_complete())
+		.filter(|v| v.is_complete())
+		.next()
 		.ok_or(Error::NotFound)?;
 
 	let source_last_state = match &source_last_v.state {
@@ -61,8 +62,6 @@ pub async fn handle_copy(
 		_ => old_meta.clone(),
 	};
 
-	let etag = new_meta.etag.to_string();
-
 	// Save object copy
 	match source_last_state {
 		ObjectVersionData::DeleteMarker => unreachable!(),
@@ -160,13 +159,13 @@ pub async fn handle_copy(
 	}
 
 	let last_modified = msec_to_rfc3339(new_timestamp);
-	let result = s3_xml::CopyObjectResult {
+	let mut xml = String::new();
-		last_modified: s3_xml::Value(last_modified),
+	writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
-		etag: s3_xml::Value(etag),
+	writeln!(&mut xml, r#"<CopyObjectResult>"#).unwrap();
-	};
+	writeln!(&mut xml, "\t<LastModified>{}</LastModified>", last_modified).unwrap();
-	let xml = s3_xml::to_xml_with_header(&result)?;
+	writeln!(&mut xml, "</CopyObjectResult>").unwrap();
 
 	Ok(Response::builder()
 		.header("Content-Type", "application/xml")
-		.body(Body::from(xml))?)
+		.body(Body::from(xml.into_bytes()))?)
 }

src/api/s3_delete.rs

@@ -1,3 +1,4 @@
+use std::fmt::Write;
 use std::sync::Arc;
 
 use hyper::{Body, Request, Response};
@@ -8,27 +9,25 @@ use garage_util::time::*;
 use garage_model::garage::Garage;
 use garage_model::object_table::*;
 
+use crate::encoding::*;
 use crate::error::*;
-use crate::s3_xml;
 use crate::signature::verify_signed_content;
 
 async fn handle_delete_internal(
 	garage: &Garage,
 	bucket: &str,
 	key: &str,
-) -> Result<(Uuid, Uuid), Error> {
+) -> Result<(UUID, UUID), Error> {
 	let object = garage
 		.object_table
 		.get(&bucket.to_string(), &key.to_string())
 		.await?
 		.ok_or(Error::NotFound)?; // No need to delete
 
-	let interesting_versions = object.versions().iter().filter(|v| {
+	let interesting_versions = object.versions().iter().filter(|v| match v.state {
-		!matches!(
+		ObjectVersionState::Aborted => false,
-			v.state,
+		ObjectVersionState::Complete(ObjectVersionData::DeleteMarker) => false,
-			ObjectVersionState::Aborted
+		_ => true,
-				| ObjectVersionState::Complete(ObjectVersionData::DeleteMarker)
-		)
 	});
 
 	let mut version_to_delete = None;
@@ -84,45 +83,52 @@ pub async fn handle_delete_objects(
 	let cmd_xml = roxmltree::Document::parse(&std::str::from_utf8(&body)?)?;
 	let cmd = parse_delete_objects_xml(&cmd_xml).ok_or_bad_request("Invalid delete XML query")?;
 
-	let mut ret_deleted = Vec::new();
+	let mut retxml = String::new();
-	let mut ret_errors = Vec::new();
+	writeln!(&mut retxml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
+	writeln!(&mut retxml, "<DeleteObjectsOutput>").unwrap();
 
 	for obj in cmd.objects.iter() {
 		match handle_delete_internal(&garage, bucket, &obj.key).await {
 			Ok((deleted_version, delete_marker_version)) => {
-				if cmd.quiet {
+				writeln!(&mut retxml, "\t<Deleted>").unwrap();
-					continue;
+				writeln!(&mut retxml, "\t\t<Key>{}</Key>", xml_escape(&obj.key)).unwrap();
-				}
+				writeln!(
-				ret_deleted.push(s3_xml::Deleted {
+					&mut retxml,
-					key: s3_xml::Value(obj.key.clone()),
+					"\t\t<VersionId>{}</VersionId>",
-					version_id: s3_xml::Value(hex::encode(deleted_version)),
+					hex::encode(deleted_version)
-					delete_marker_version_id: s3_xml::Value(hex::encode(delete_marker_version)),
+				)
-				});
+				.unwrap();
+				writeln!(
+					&mut retxml,
+					"\t\t<DeleteMarkerVersionId>{}</DeleteMarkerVersionId>",
+					hex::encode(delete_marker_version)
+				)
+				.unwrap();
+				writeln!(&mut retxml, "\t</Deleted>").unwrap();
 			}
 			Err(e) => {
-				ret_errors.push(s3_xml::DeleteError {
+				writeln!(&mut retxml, "\t<Error>").unwrap();
-					code: s3_xml::Value(e.aws_code().to_string()),
+				writeln!(&mut retxml, "\t\t<Code>{}</Code>", e.http_status_code()).unwrap();
-					key: Some(s3_xml::Value(obj.key.clone())),
+				writeln!(&mut retxml, "\t\t<Key>{}</Key>", xml_escape(&obj.key)).unwrap();
-					message: s3_xml::Value(format!("{}", e)),
+				writeln!(
-					version_id: None,
+					&mut retxml,
-				});
+					"\t\t<Message>{}</Message>",
+					xml_escape(&format!("{}", e))
+				)
+				.unwrap();
+				writeln!(&mut retxml, "\t</Error>").unwrap();
 			}
 		}
 	}
 
-	let xml = s3_xml::to_xml_with_header(&s3_xml::DeleteResult {
+	writeln!(&mut retxml, "</DeleteObjectsOutput>").unwrap();
-		xmlns: (),
-		deleted: ret_deleted,
-		errors: ret_errors,
-	})?;
 
 	Ok(Response::builder()
 		.header("Content-Type", "application/xml")
-		.body(Body::from(xml))?)
+		.body(Body::from(retxml.into_bytes()))?)
 }
 
 struct DeleteRequest {
-	quiet: bool,
 	objects: Vec<DeleteObject>,
 }
 
@@ -131,10 +137,7 @@ struct DeleteObject {
 }
 
 fn parse_delete_objects_xml(xml: &roxmltree::Document) -> Option<DeleteRequest> {
-	let mut ret = DeleteRequest {
+	let mut ret = DeleteRequest { objects: vec![] };
-		quiet: false,
-		objects: vec![],
-	};
 
 	let root = xml.root();
 	let delete = root.first_child()?;
@@ -150,12 +153,6 @@ fn parse_delete_objects_xml(xml: &roxmltree::Document) -> Option<DeleteRequest>
 			ret.objects.push(DeleteObject {
 				key: key_str.to_string(),
 			});
-		} else if item.has_tag_name("Quiet") {
-			if item.text()? == "true" {
-				ret.quiet = true;
-			} else {
-				ret.quiet = false;
-			}
 		} else {
 			return None;
 		}

src/api/s3_get.rs

@@ -28,7 +28,7 @@ fn object_headers(
 			version_meta.headers.content_type.to_string(),
 		)
 		.header("Last-Modified", date_str)
-		.header("Accept-Ranges", "bytes".to_string());
+		.header("Accept-Ranges", format!("bytes"));
 
 	if !version_meta.etag.is_empty() {
 		resp = resp.header("ETag", format!("\"{}\"", version_meta.etag));
@@ -97,7 +97,8 @@ pub async fn handle_head(
 		.versions()
 		.iter()
 		.rev()
-		.find(|v| v.is_data())
+		.filter(|v| v.is_data())
+		.next()
 		.ok_or(Error::NotFound)?;
 
 	let version_meta = match &version.state {
@@ -136,7 +137,8 @@ pub async fn handle_get(
 		.versions()
 		.iter()
 		.rev()
-		.find(|v| v.is_complete())
+		.filter(|v| v.is_complete())
+		.next()
 		.ok_or(Error::NotFound)?;
 
 	let last_v_data = match &last_v.state {
@@ -158,9 +160,7 @@ pub async fn handle_get(
 			let range_str = range.to_str()?;
 			let mut ranges = http_range::HttpRange::parse(range_str, last_v_meta.size)?;
 			if ranges.len() > 1 {
-				return Err(Error::BadRequest(
+				return Err(Error::BadRequest(format!("Multiple ranges not supported")));
-					"Multiple ranges not supported".to_string(),
-				));
 			} else {
 				ranges.pop()
 			}
@@ -236,7 +236,7 @@ async fn handle_get_range(
 	end: u64,
 ) -> Result<Response<Body>, Error> {
 	if end > version_meta.size {
-		return Err(Error::BadRequest("Range not included in file".to_string()));
+		return Err(Error::BadRequest(format!("Range not included in file")));
 	}
 
 	let resp_builder = object_headers(version, version_meta)
@@ -282,7 +282,7 @@ async fn handle_get_range(
 				}
 				// Keep only blocks that have an intersection with the requested range
 				if true_offset < end && true_offset + b.size > begin {
-					blocks.push((*b, true_offset));
+					blocks.push((b.clone(), true_offset));
 				}
 				true_offset += b.size;
 			}
@@ -303,9 +303,9 @@ async fn handle_get_range(
 						} else {
 							end - true_offset
 						};
-						Result::<Bytes, Error>::Ok(
+						Result::<Bytes, Error>::Ok(Bytes::from(
 							data.slice(start_in_block as usize..end_in_block as usize),
-						)
+						))
 					}
 				})
 				.buffered(2);

src/api/s3_list.rs

@@ -1,4 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::fmt::Write;
 use std::sync::Arc;
 
 use hyper::{Body, Response};
@@ -13,7 +14,6 @@ use garage_table::DeletedFilter;
 
 use crate::encoding::*;
 use crate::error::*;
-use crate::s3_xml;
 
 #[derive(Debug)]
 pub struct ListObjectsQuery {
@@ -50,7 +50,7 @@ pub fn parse_list_objects_query(
 					.ok_or_bad_request("Invalid value for max-keys")
 			})
 			.unwrap_or(Ok(1000))?,
-		prefix: params.get("prefix").cloned().unwrap_or_default(),
+		prefix: params.get("prefix").cloned().unwrap_or(String::new()),
 		marker: params.get("marker").cloned(),
 		continuation_token: params.get("continuation-token").cloned(),
 		start_after: params.get("start-after").cloned(),
@@ -72,13 +72,10 @@ pub async fn handle_list(
 		if let Some(ct) = &query.continuation_token {
 			String::from_utf8(base64::decode(ct.as_bytes())?)?
 		} else {
-			query
+			query.start_after.clone().unwrap_or(query.prefix.clone())
-				.start_after
-				.clone()
-				.unwrap_or_else(|| query.prefix.clone())
 		}
 	} else {
-		query.marker.clone().unwrap_or_else(|| query.prefix.clone())
+		query.marker.clone().unwrap_or(query.prefix.clone())
 	};
 
 	debug!(
@@ -158,86 +155,131 @@ pub async fn handle_list(
 			truncated = None;
 			break 'query_loop;
 		}
-		if !objects.is_empty() {
+		if objects.len() > 0 {
 			next_chunk_start = objects[objects.len() - 1].key.clone();
 		}
 	}
 
-	let mut result = s3_xml::ListBucketResult {
+	let mut xml = String::new();
-		xmlns: (),
+	writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
-		name: s3_xml::Value(query.bucket.to_string()),
+	writeln!(
-		prefix: uriencode_maybe(&query.prefix, query.urlencode_resp),
+		&mut xml,
-		marker: None,
+		r#"<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">"#
-		next_marker: None,
+	)
-		start_after: None,
+	.unwrap();
-		continuation_token: None,
-		next_continuation_token: None,
-		max_keys: s3_xml::IntValue(query.max_keys as i64),
-		delimiter: query
-			.delimiter
-			.as_ref()
-			.map(|x| uriencode_maybe(x, query.urlencode_resp)),
-		encoding_type: match query.urlencode_resp {
-			true => Some(s3_xml::Value("url".to_string())),
-			false => None,
-		},
 
-		key_count: Some(s3_xml::IntValue(
+	writeln!(&mut xml, "\t<Name>{}</Name>", query.bucket).unwrap();
-			result_keys.len() as i64 + result_common_prefixes.len() as i64,
+
-		)),
+	// TODO: in V1, is this supposed to be urlencoded when encoding-type is URL??
-		is_truncated: s3_xml::Value(format!("{}", truncated.is_some())),
+	writeln!(
-		contents: vec![],
+		&mut xml,
-		common_prefixes: vec![],
+		"\t<Prefix>{}</Prefix>",
-	};
+		xml_encode_key(&query.prefix, query.urlencode_resp),
+	)
+	.unwrap();
+
+	if let Some(delim) = &query.delimiter {
+		// TODO: in V1, is this supposed to be urlencoded when encoding-type is URL??
+		writeln!(
+			&mut xml,
+			"\t<Delimiter>{}</Delimiter>",
+			xml_encode_key(delim, query.urlencode_resp),
+		)
+		.unwrap();
+	}
+
+	writeln!(&mut xml, "\t<MaxKeys>{}</MaxKeys>", query.max_keys).unwrap();
+	if query.urlencode_resp {
+		writeln!(&mut xml, "\t<EncodingType>url</EncodingType>").unwrap();
+	}
+
+	writeln!(
+		&mut xml,
+		"\t<KeyCount>{}</KeyCount>",
+		result_keys.len() + result_common_prefixes.len()
+	)
+	.unwrap();
+	writeln!(
+		&mut xml,
+		"\t<IsTruncated>{}</IsTruncated>",
+		truncated.is_some()
+	)
+	.unwrap();
 
 	if query.is_v2 {
 		if let Some(ct) = &query.continuation_token {
-			result.continuation_token = Some(s3_xml::Value(ct.to_string()));
+			writeln!(&mut xml, "\t<ContinuationToken>{}</ContinuationToken>", ct).unwrap();
 		}
 		if let Some(sa) = &query.start_after {
-			result.start_after = Some(uriencode_maybe(sa, query.urlencode_resp));
+			writeln!(
+				&mut xml,
+				"\t<StartAfter>{}</StartAfter>",
+				xml_encode_key(sa, query.urlencode_resp)
+			)
+			.unwrap();
 		}
 		if let Some(nct) = truncated {
-			result.next_continuation_token = Some(s3_xml::Value(base64::encode(nct.as_bytes())));
+			writeln!(
+				&mut xml,
+				"\t<NextContinuationToken>{}</NextContinuationToken>",
+				base64::encode(nct.as_bytes())
+			)
+			.unwrap();
 		}
 	} else {
 		// TODO: are these supposed to be urlencoded when encoding-type is URL??
 		if let Some(mkr) = &query.marker {
-			result.marker = Some(uriencode_maybe(mkr, query.urlencode_resp));
+			writeln!(
+				&mut xml,
+				"\t<Marker>{}</Marker>",
+				xml_encode_key(mkr, query.urlencode_resp)
+			)
+			.unwrap();
 		}
 		if let Some(next_marker) = truncated {
-			result.next_marker = Some(uriencode_maybe(&next_marker, query.urlencode_resp));
+			writeln!(
+				&mut xml,
+				"\t<NextMarker>{}</NextMarker>",
+				xml_encode_key(&next_marker, query.urlencode_resp)
+			)
+			.unwrap();
 		}
 	}
 
 	for (key, info) in result_keys.iter() {
-		result.contents.push(s3_xml::ListBucketItem {
+		let last_modif = msec_to_rfc3339(info.last_modified);
-			key: uriencode_maybe(key, query.urlencode_resp),
+		writeln!(&mut xml, "\t<Contents>").unwrap();
-			last_modified: s3_xml::Value(msec_to_rfc3339(info.last_modified)),
+		writeln!(
-			size: s3_xml::IntValue(info.size as i64),
+			&mut xml,
-			etag: s3_xml::Value(info.etag.to_string()),
+			"\t\t<Key>{}</Key>",
-			storage_class: s3_xml::Value("STANDARD".to_string()),
+			xml_encode_key(key, query.urlencode_resp),
-		});
+		)
+		.unwrap();
+		writeln!(&mut xml, "\t\t<LastModified>{}</LastModified>", last_modif).unwrap();
+		writeln!(&mut xml, "\t\t<Size>{}</Size>", info.size).unwrap();
+		if !info.etag.is_empty() {
+			writeln!(&mut xml, "\t\t<ETag>\"{}\"</ETag>", info.etag).unwrap();
+		}
+		writeln!(&mut xml, "\t\t<StorageClass>STANDARD</StorageClass>").unwrap();
+		writeln!(&mut xml, "\t</Contents>").unwrap();
 	}
 
 	for pfx in result_common_prefixes.iter() {
+		writeln!(&mut xml, "\t<CommonPrefixes>").unwrap();
 		//TODO: in V1, are these urlencoded when urlencode_resp is true ?? (proably)
-		result.common_prefixes.push(s3_xml::CommonPrefix {
+		writeln!(
-			prefix: uriencode_maybe(pfx, query.urlencode_resp),
+			&mut xml,
-		});
+			"\t\t<Prefix>{}</Prefix>",
+			xml_encode_key(pfx, query.urlencode_resp),
+		)
+		.unwrap();
+		writeln!(&mut xml, "\t</CommonPrefixes>").unwrap();
 	}
 
-	let xml = s3_xml::to_xml_with_header(&result)?;
+	writeln!(&mut xml, "</ListBucketResult>").unwrap();
+	debug!("{}", xml);
 
 	Ok(Response::builder()
 		.header("Content-Type", "application/xml")
 		.body(Body::from(xml.into_bytes()))?)
 }
-
-fn uriencode_maybe(s: &str, yes: bool) -> s3_xml::Value {
-	if yes {
-		s3_xml::Value(uri_encode(s, true))
-	} else {
-		s3_xml::Value(s.to_string())
-	}
-}

src/api/s3_put.rs

@@ -1,6 +1,8 @@
 use std::collections::{BTreeMap, VecDeque};
+use std::fmt::Write;
 use std::sync::Arc;
 
+use fastcdc::{Chunk, FastCDC};
 use futures::stream::*;
 use hyper::{Body, Request, Response};
 use md5::{digest::generic_array::*, Digest as Md5Digest, Md5};
@@ -17,10 +19,12 @@ use garage_model::garage::Garage;
 use garage_model::object_table::*;
 use garage_model::version_table::*;
 
+use crate::encoding::*;
 use crate::error::*;
-use crate::s3_xml;
 use crate::signature::verify_signed_content;
 
+// ---- PutObject call ----
+
 pub async fn handle_put(
 	garage: Arc<Garage>,
 	req: Request<Body>,
@@ -45,7 +49,7 @@ pub async fn handle_put(
 	let body = req.into_body();
 
 	let mut chunker = BodyChunker::new(body, garage.config.block_size);
-	let first_block = chunker.next().await?.unwrap_or_default();
+	let first_block = chunker.next().await?.unwrap_or(vec![]);
 
 	// If body is small enough, store it directly in the object table
 	// as "inline data". We can then return immediately.
@@ -149,33 +153,432 @@ pub async fn handle_put(
 	Ok(put_response(version_uuid, md5sum_hex))
 }
 
-/// Validate MD5 sum against content-md5 header
+pub fn put_response(version_uuid: UUID, md5sum_hex: String) -> Response<Body> {
-/// and sha256sum against signed content-sha256
+	Response::builder()
-fn ensure_checksum_matches(
+		.header("x-amz-version-id", hex::encode(version_uuid))
-	data_md5sum: &[u8],
+		.header("ETag", format!("\"{}\"", md5sum_hex))
-	data_sha256sum: garage_util::data::FixedBytes32,
+		.body(Body::from(vec![]))
-	content_md5: Option<&str>,
+		.unwrap()
-	content_sha256: Option<garage_util::data::FixedBytes32>,
+}
-) -> Result<(), Error> {
+
-	if let Some(expected_sha256) = content_sha256 {
+// ---- Mutlipart upload calls ----
-		if expected_sha256 != data_sha256sum {
+
-			return Err(Error::BadRequest(
+pub async fn handle_create_multipart_upload(
-				"Unable to validate x-amz-content-sha256".to_string(),
+	garage: Arc<Garage>,
-			));
+	req: &Request<Body>,
+	bucket: &str,
+	key: &str,
+) -> Result<Response<Body>, Error> {
+	let version_uuid = gen_uuid();
+	let headers = get_headers(req)?;
+
+	// Create object in object table
+	let object_version = ObjectVersion {
+		uuid: version_uuid,
+		timestamp: now_msec(),
+		state: ObjectVersionState::Uploading(headers),
+	};
+	let object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
+	garage.object_table.insert(&object).await?;
+
+	// Insert empty version so that block_ref entries refer to something
+	// (they are inserted concurrently with blocks in the version table, so
+	// there is the possibility that they are inserted before the version table
+	// is created, in which case it is allowed to delete them, e.g. in repair_*)
+	let version = Version::new(version_uuid, bucket.into(), key.into(), false);
+	garage.version_table.insert(&version).await?;
+
+	// Send success response
+	let mut xml = String::new();
+	writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
+	writeln!(
+		&mut xml,
+		r#"<InitiateMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">"#
+	)
+	.unwrap();
+	writeln!(&mut xml, "\t<Bucket>{}</Bucket>", bucket).unwrap();
+	writeln!(&mut xml, "\t<Key>{}</Key>", xml_escape(key)).unwrap();
+	writeln!(
+		&mut xml,
+		"\t<UploadId>{}</UploadId>",
+		hex::encode(version_uuid)
+	)
+	.unwrap();
+	writeln!(&mut xml, "</InitiateMultipartUploadResult>").unwrap();
+
+	Ok(Response::new(Body::from(xml.into_bytes())))
+}
+
+pub async fn handle_put_part(
+	garage: Arc<Garage>,
+	req: Request<Body>,
+	bucket: &str,
+	key: &str,
+	part_number_str: &str,
+	upload_id: &str,
+	content_sha256: Option<Hash>,
+) -> Result<Response<Body>, Error> {
+	// Check parameters
+	let part_number = part_number_str
+		.parse::<u64>()
+		.ok_or_bad_request("Invalid part number")?;
+
+	let version_uuid = decode_upload_id(upload_id)?;
+
+	let content_md5 = match req.headers().get("content-md5") {
+		Some(x) => Some(x.to_str()?.to_string()),
+		None => None,
+	};
+
+	// Read first chuck, and at the same time try to get object to see if it exists
+	let bucket = bucket.to_string();
+	let key = key.to_string();
+	let mut chunker = BodyChunker::new(req.into_body(), garage.config.block_size);
+
+	let (object, first_block) =
+		futures::try_join!(garage.object_table.get(&bucket, &key), chunker.next(),)?;
+
+	// Check object is valid and multipart block can be accepted
+	let first_block = first_block.ok_or(Error::BadRequest(format!("Empty body")))?;
+	let object = object.ok_or(Error::BadRequest(format!("Object not found")))?;
+
+	if !object
+		.versions()
+		.iter()
+		.any(|v| v.uuid == version_uuid && v.is_uploading())
+	{
+		return Err(Error::NotFound);
+	}
+
+	// Copy block to store
+	let version = Version::new(version_uuid, bucket, key, false);
+	let first_block_hash = blake2sum(&first_block[..]);
+	let (_, data_md5sum, data_sha256sum) = read_and_put_blocks(
+		&garage,
+		&version,
+		part_number,
+		first_block,
+		first_block_hash,
+		&mut chunker,
+	)
+	.await?;
+
+	// Verify that checksums map
+	ensure_checksum_matches(
+		data_md5sum.as_slice(),
+		data_sha256sum,
+		content_md5.as_deref(),
+		content_sha256,
+	)?;
+
+	// Store part etag in version
+	let data_md5sum_hex = hex::encode(data_md5sum);
+	let mut version = version;
+	version
+		.parts_etags
+		.put(part_number, data_md5sum_hex.clone());
+	garage.version_table.insert(&version).await?;
+
+	let response = Response::builder()
+		.header("ETag", format!("\"{}\"", data_md5sum_hex))
+		.body(Body::from(vec![]))
+		.unwrap();
+	Ok(response)
+}
+
+pub async fn handle_complete_multipart_upload(
+	garage: Arc<Garage>,
+	req: Request<Body>,
+	bucket: &str,
+	key: &str,
+	upload_id: &str,
+	content_sha256: Option<Hash>,
+) -> Result<Response<Body>, Error> {
+	let body = hyper::body::to_bytes(req.into_body()).await?;
+	verify_signed_content(content_sha256, &body[..])?;
+
+	let body_xml = roxmltree::Document::parse(&std::str::from_utf8(&body)?)?;
+	let body_list_of_parts = parse_complete_multpart_upload_body(&body_xml)
+		.ok_or_bad_request("Invalid CompleteMultipartUpload XML")?;
+	debug!(
+		"CompleteMultipartUpload list of parts: {:?}",
+		body_list_of_parts
+	);
+
+	let version_uuid = decode_upload_id(upload_id)?;
+
+	let bucket = bucket.to_string();
+	let key = key.to_string();
+	let (object, version) = futures::try_join!(
+		garage.object_table.get(&bucket, &key),
+		garage.version_table.get(&version_uuid, &EmptyKey),
+	)?;
+
+	let object = object.ok_or(Error::BadRequest(format!("Object not found")))?;
+	let mut object_version = object
+		.versions()
+		.iter()
+		.find(|v| v.uuid == version_uuid && v.is_uploading())
+		.cloned()
+		.ok_or(Error::BadRequest(format!("Version not found")))?;
+
+	let version = version.ok_or(Error::BadRequest(format!("Version not found")))?;
+	if version.blocks.len() == 0 {
+		return Err(Error::BadRequest(format!("No data was uploaded")));
+	}
+
+	let headers = match object_version.state {
+		ObjectVersionState::Uploading(headers) => headers.clone(),
+		_ => unreachable!(),
+	};
+
+	// Check that the list of parts they gave us corresponds to the parts we have here
+	debug!("Expected parts from request: {:?}", body_list_of_parts);
+	debug!("Parts stored in version: {:?}", version.parts_etags.items());
+	let parts = version
+		.parts_etags
+		.items()
+		.iter()
+		.map(|pair| (&pair.0, &pair.1));
+	let same_parts = body_list_of_parts
+		.iter()
+		.map(|x| (&x.part_number, &x.etag))
+		.eq(parts);
+	if !same_parts {
+		return Err(Error::BadRequest(format!("We don't have the same parts")));
+	}
+
+	// Calculate etag of final object
+	// To understand how etags are calculated, read more here:
+	// https://teppen.io/2018/06/23/aws_s3_etags/
+	let num_parts = version.blocks.items().last().unwrap().0.part_number
+		- version.blocks.items().first().unwrap().0.part_number
+		+ 1;
+	let mut etag_md5_hasher = Md5::new();
+	for (_, etag) in version.parts_etags.items().iter() {
+		etag_md5_hasher.update(etag.as_bytes());
+	}
+	let etag = format!("{}-{}", hex::encode(etag_md5_hasher.finalize()), num_parts);
+
+	// Calculate total size of final object
+	let total_size = version.blocks.items().iter().map(|x| x.1.size).sum();
+
+	// Write final object version
+	object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
+		ObjectVersionMeta {
+			headers,
+			size: total_size,
+			etag,
+		},
+		version.blocks.items()[0].1.hash,
+	));
+
+	let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]);
+	garage.object_table.insert(&final_object).await?;
+
+	// Send response saying ok we're done
+	let mut xml = String::new();
+	writeln!(&mut xml, r#"<?xml version="1.0" encoding="UTF-8"?>"#).unwrap();
+	writeln!(
+		&mut xml,
+		r#"<CompleteMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">"#
+	)
+	.unwrap();
+	writeln!(
+		&mut xml,
+		"\t<Location>{}</Location>",
+		garage.config.s3_api.s3_region
+	)
+	.unwrap();
+	writeln!(&mut xml, "\t<Bucket>{}</Bucket>", bucket).unwrap();
+	writeln!(&mut xml, "\t<Key>{}</Key>", xml_escape(&key)).unwrap();
+	writeln!(&mut xml, "</CompleteMultipartUploadResult>").unwrap();
+
+	Ok(Response::new(Body::from(xml.into_bytes())))
+}
+
+pub async fn handle_abort_multipart_upload(
+	garage: Arc<Garage>,
+	bucket: &str,
+	key: &str,
+	upload_id: &str,
+) -> Result<Response<Body>, Error> {
+	let version_uuid = decode_upload_id(upload_id)?;
+
+	let object = garage
+		.object_table
+		.get(&bucket.to_string(), &key.to_string())
+		.await?;
+	let object = object.ok_or(Error::BadRequest(format!("Object not found")))?;
+
+	let object_version = object
+		.versions()
+		.iter()
+		.find(|v| v.uuid == version_uuid && v.is_uploading());
+	let mut object_version = match object_version {
+		None => return Err(Error::NotFound),
+		Some(x) => x.clone(),
+	};
+
+	object_version.state = ObjectVersionState::Aborted;
+	let final_object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
+	garage.object_table.insert(&final_object).await?;
+
+	Ok(Response::new(Body::from(vec![])))
+}
+
+// ---- Parsing input to multipart upload calls ----
+
+fn decode_upload_id(id: &str) -> Result<UUID, Error> {
+	let id_bin = hex::decode(id).ok_or_bad_request("Invalid upload ID")?;
+	if id_bin.len() != 32 {
+		return None.ok_or_bad_request("Invalid upload ID");
+	}
+	let mut uuid = [0u8; 32];
+	uuid.copy_from_slice(&id_bin[..]);
+	Ok(UUID::from(uuid))
+}
+
+#[derive(Debug)]
+struct CompleteMultipartUploadPart {
+	etag: String,
+	part_number: u64,
+}
+
+fn parse_complete_multpart_upload_body(
+	xml: &roxmltree::Document,
+) -> Option<Vec<CompleteMultipartUploadPart>> {
+	let mut parts = vec![];
+
+	let root = xml.root();
+	let cmu = root.first_child()?;
+	if !cmu.has_tag_name("CompleteMultipartUpload") {
+		return None;
+	}
+
+	for item in cmu.children() {
+		if item.has_tag_name("Part") {
+			let etag = item.children().find(|e| e.has_tag_name("ETag"))?.text()?;
+			let part_number = item
+				.children()
+				.find(|e| e.has_tag_name("PartNumber"))?
+				.text()?;
+			parts.push(CompleteMultipartUploadPart {
+				etag: etag.trim_matches('"').to_string(),
+				part_number: part_number.parse().ok()?,
+			});
 		} else {
-			trace!("Successfully validated x-amz-content-sha256");
+			return None;
 		}
 	}
-	if let Some(expected_md5) = content_md5 {
+
-		if expected_md5.trim_matches('"') != base64::encode(data_md5sum) {
+	Some(parts)
-			return Err(Error::BadRequest(
+}
-				"Unable to validate content-md5".to_string(),
+
-			));
+// ---- Common code ----
-		} else {
+
-			trace!("Successfully validated content-md5");
+pub(crate) fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, Error> {
+	let content_type = req
+		.headers()
+		.get(hyper::header::CONTENT_TYPE)
+		.map(|x| x.to_str())
+		.unwrap_or(Ok("blob"))?
+		.to_string();
+
+	let mut other = BTreeMap::new();
+
+	// Preserve standard headers
+	let standard_header = vec![
+		hyper::header::CACHE_CONTROL,
+		hyper::header::CONTENT_DISPOSITION,
+		hyper::header::CONTENT_ENCODING,
+		hyper::header::CONTENT_LANGUAGE,
+		hyper::header::EXPIRES,
+	];
+	for h in standard_header.iter() {
+		if let Some(v) = req.headers().get(h) {
+			match v.to_str() {
+				Ok(v_str) => {
+					other.insert(h.to_string(), v_str.to_string());
+				}
+				Err(e) => {
+					warn!("Discarding header {}, error in .to_str(): {}", h, e);
+				}
+			}
+		}
+	}
+
+	// Preserve x-amz-meta- headers
+	for (k, v) in req.headers().iter() {
+		if k.as_str().starts_with("x-amz-meta-") {
+			match v.to_str() {
+				Ok(v_str) => {
+					other.insert(k.to_string(), v_str.to_string());
+				}
+				Err(e) => {
+					warn!("Discarding header {}, error in .to_str(): {}", k, e);
+				}
+			}
+		}
+	}
+
+	Ok(ObjectVersionHeaders {
+		content_type,
+		other,
+	})
+}
+
+struct BodyChunker {
+	body: Body,
+	read_all: bool,
+	min_block_size: usize,
+	avg_block_size: usize,
+	max_block_size: usize,
+	buf: VecDeque<u8>,
+}
+
+impl BodyChunker {
+	fn new(body: Body, block_size: usize) -> Self {
+		let min_block_size = block_size / 4 * 3;
+		let avg_block_size = block_size;
+		let max_block_size = block_size * 2;
+		Self {
+			body,
+			read_all: false,
+			min_block_size,
+			avg_block_size,
+			max_block_size,
+			buf: VecDeque::with_capacity(2 * max_block_size),
+		}
+	}
+	async fn next(&mut self) -> Result<Option<Vec<u8>>, GarageError> {
+		while !self.read_all && self.buf.len() < self.max_block_size {
+			if let Some(block) = self.body.next().await {
+				let bytes = block?;
+				trace!("Body next: {} bytes", bytes.len());
+				self.buf.extend(&bytes[..]);
+			} else {
+				self.read_all = true;
+			}
+		}
+		if self.buf.len() == 0 {
+			Ok(None)
+		} else {
+			let mut iter = FastCDC::with_eof(
+				self.buf.make_contiguous(),
+				self.min_block_size,
+				self.avg_block_size,
+				self.max_block_size,
+				self.read_all,
+			);
+			if let Some(Chunk { length, .. }) = iter.next() {
+				let block = self.buf.drain(..length).collect::<Vec<u8>>();
+				Ok(Some(block))
+			} else {
+				unreachable!("FastCDC returned not chunk")
+			}
 		}
 	}
-	Ok(())
 }
 
 async fn read_and_put_blocks(
@@ -266,397 +669,29 @@ async fn put_block_meta(
 	Ok(())
 }
 
-struct BodyChunker {
+/// Validate MD5 sum against content-md5 header
-	body: Body,
+/// and sha256sum against signed content-sha256
-	read_all: bool,
+fn ensure_checksum_matches(
-	block_size: usize,
+	data_md5sum: &[u8],
-	buf: VecDeque<u8>,
+	data_sha256sum: garage_util::data::FixedBytes32,
-}
+	content_md5: Option<&str>,
-
+	content_sha256: Option<garage_util::data::FixedBytes32>,
-impl BodyChunker {
+) -> Result<(), Error> {
-	fn new(body: Body, block_size: usize) -> Self {
+	if let Some(expected_sha256) = content_sha256 {
-		Self {
+		if expected_sha256 != data_sha256sum {
-			body,
+			return Err(Error::BadRequest(format!(
-			read_all: false,
+				"Unable to validate x-amz-content-sha256"
-			block_size,
+			)));
-			buf: VecDeque::with_capacity(2 * block_size),
-		}
-	}
-	async fn next(&mut self) -> Result<Option<Vec<u8>>, GarageError> {
-		while !self.read_all && self.buf.len() < self.block_size {
-			if let Some(block) = self.body.next().await {
-				let bytes = block?;
-				trace!("Body next: {} bytes", bytes.len());
-				self.buf.extend(&bytes[..]);
-			} else {
-				self.read_all = true;
-			}
-		}
-		if self.buf.is_empty() {
-			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>>();
+			trace!("Successfully validated x-amz-content-sha256");
-			Ok(Some(block))
 		}
 	}
-}
+	if let Some(expected_md5) = content_md5 {
-
+		if expected_md5.trim_matches('"') != base64::encode(data_md5sum) {
-pub fn put_response(version_uuid: Uuid, md5sum_hex: String) -> Response<Body> {
+			return Err(Error::BadRequest(format!("Unable to validate content-md5")));
-	Response::builder()
-		.header("x-amz-version-id", hex::encode(version_uuid))
-		.header("ETag", format!("\"{}\"", md5sum_hex))
-		.body(Body::from(vec![]))
-		.unwrap()
-}
-
-pub async fn handle_create_multipart_upload(
-	garage: Arc<Garage>,
-	req: &Request<Body>,
-	bucket: &str,
-	key: &str,
-) -> Result<Response<Body>, Error> {
-	let version_uuid = gen_uuid();
-	let headers = get_headers(req)?;
-
-	// Create object in object table
-	let object_version = ObjectVersion {
-		uuid: version_uuid,
-		timestamp: now_msec(),
-		state: ObjectVersionState::Uploading(headers),
-	};
-	let object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
-	garage.object_table.insert(&object).await?;
-
-	// Insert empty version so that block_ref entries refer to something
-	// (they are inserted concurrently with blocks in the version table, so
-	// there is the possibility that they are inserted before the version table
-	// is created, in which case it is allowed to delete them, e.g. in repair_*)
-	let version = Version::new(version_uuid, bucket.into(), key.into(), false);
-	garage.version_table.insert(&version).await?;
-
-	// Send success response
-	let result = s3_xml::InitiateMultipartUploadResult {
-		xmlns: (),
-		bucket: s3_xml::Value(bucket.to_string()),
-		key: s3_xml::Value(key.to_string()),
-		upload_id: s3_xml::Value(hex::encode(version_uuid)),
-	};
-	let xml = s3_xml::to_xml_with_header(&result)?;
-
-	Ok(Response::new(Body::from(xml.into_bytes())))
-}
-
-pub async fn handle_put_part(
-	garage: Arc<Garage>,
-	req: Request<Body>,
-	bucket: &str,
-	key: &str,
-	part_number_str: &str,
-	upload_id: &str,
-	content_sha256: Option<Hash>,
-) -> Result<Response<Body>, Error> {
-	// Check parameters
-	let part_number = part_number_str
-		.parse::<u64>()
-		.ok_or_bad_request("Invalid part number")?;
-
-	let version_uuid = decode_upload_id(upload_id)?;
-
-	let content_md5 = match req.headers().get("content-md5") {
-		Some(x) => Some(x.to_str()?.to_string()),
-		None => None,
-	};
-
-	// Read first chuck, and at the same time try to get object to see if it exists
-	let bucket = bucket.to_string();
-	let key = key.to_string();
-	let mut chunker = BodyChunker::new(req.into_body(), garage.config.block_size);
-
-	let (object, first_block) =
-		futures::try_join!(garage.object_table.get(&bucket, &key), chunker.next(),)?;
-
-	// Check object is valid and multipart block can be accepted
-	let first_block = first_block.ok_or_else(|| Error::BadRequest("Empty body".to_string()))?;
-	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;
-
-	if !object
-		.versions()
-		.iter()
-		.any(|v| v.uuid == version_uuid && v.is_uploading())
-	{
-		return Err(Error::NotFound);
-	}
-
-	// Copy block to store
-	let version = Version::new(version_uuid, bucket, key, false);
-	let first_block_hash = blake2sum(&first_block[..]);
-	let (_, data_md5sum, data_sha256sum) = read_and_put_blocks(
-		&garage,
-		&version,
-		part_number,
-		first_block,
-		first_block_hash,
-		&mut chunker,
-	)
-	.await?;
-
-	// Verify that checksums map
-	ensure_checksum_matches(
-		data_md5sum.as_slice(),
-		data_sha256sum,
-		content_md5.as_deref(),
-		content_sha256,
-	)?;
-
-	// Store part etag in version
-	let data_md5sum_hex = hex::encode(data_md5sum);
-	let mut version = version;
-	version
-		.parts_etags
-		.put(part_number, data_md5sum_hex.clone());
-	garage.version_table.insert(&version).await?;
-
-	let response = Response::builder()
-		.header("ETag", format!("\"{}\"", data_md5sum_hex))
-		.body(Body::from(vec![]))
-		.unwrap();
-	Ok(response)
-}
-
-pub async fn handle_complete_multipart_upload(
-	garage: Arc<Garage>,
-	req: Request<Body>,
-	bucket: &str,
-	key: &str,
-	upload_id: &str,
-	content_sha256: Option<Hash>,
-) -> Result<Response<Body>, Error> {
-	let body = hyper::body::to_bytes(req.into_body()).await?;
-	verify_signed_content(content_sha256, &body[..])?;
-
-	let body_xml = roxmltree::Document::parse(&std::str::from_utf8(&body)?)?;
-	let body_list_of_parts = parse_complete_multpart_upload_body(&body_xml)
-		.ok_or_bad_request("Invalid CompleteMultipartUpload XML")?;
-	debug!(
-		"CompleteMultipartUpload list of parts: {:?}",
-		body_list_of_parts
-	);
-
-	let version_uuid = decode_upload_id(upload_id)?;
-
-	let bucket = bucket.to_string();
-	let key = key.to_string();
-	let (object, version) = futures::try_join!(
-		garage.object_table.get(&bucket, &key),
-		garage.version_table.get(&version_uuid, &EmptyKey),
-	)?;
-
-	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;
-	let mut object_version = object
-		.versions()
-		.iter()
-		.find(|v| v.uuid == version_uuid && v.is_uploading())
-		.cloned()
-		.ok_or_else(|| Error::BadRequest("Version not found".to_string()))?;
-
-	let version = version.ok_or_else(|| Error::BadRequest("Version not found".to_string()))?;
-	if version.blocks.is_empty() {
-		return Err(Error::BadRequest("No data was uploaded".to_string()));
-	}
-
-	let headers = match object_version.state {
-		ObjectVersionState::Uploading(headers) => headers,
-		_ => unreachable!(),
-	};
-
-	// Check that the list of parts they gave us corresponds to the parts we have here
-	debug!("Expected parts from request: {:?}", body_list_of_parts);
-	debug!("Parts stored in version: {:?}", version.parts_etags.items());
-	let parts = version
-		.parts_etags
-		.items()
-		.iter()
-		.map(|pair| (&pair.0, &pair.1));
-	let same_parts = body_list_of_parts
-		.iter()
-		.map(|x| (&x.part_number, &x.etag))
-		.eq(parts);
-	if !same_parts {
-		return Err(Error::BadRequest(
-			"We don't have the same parts".to_string(),
-		));
-	}
-
-	// Calculate etag of final object
-	// To understand how etags are calculated, read more here:
-	// https://teppen.io/2018/06/23/aws_s3_etags/
-	let num_parts = version.blocks.items().last().unwrap().0.part_number
-		- version.blocks.items().first().unwrap().0.part_number
-		+ 1;
-	let mut etag_md5_hasher = Md5::new();
-	for (_, etag) in version.parts_etags.items().iter() {
-		etag_md5_hasher.update(etag.as_bytes());
-	}
-	let etag = format!("{}-{}", hex::encode(etag_md5_hasher.finalize()), num_parts);
-
-	// Calculate total size of final object
-	let total_size = version.blocks.items().iter().map(|x| x.1.size).sum();
-
-	// Write final object version
-	object_version.state = ObjectVersionState::Complete(ObjectVersionData::FirstBlock(
-		ObjectVersionMeta {
-			headers,
-			size: total_size,
-			etag: etag.clone(),
-		},
-		version.blocks.items()[0].1.hash,
-	));
-
-	let final_object = Object::new(bucket.clone(), key.clone(), vec![object_version]);
-	garage.object_table.insert(&final_object).await?;
-
-	// Send response saying ok we're done
-	let result = s3_xml::CompleteMultipartUploadResult {
-		xmlns: (),
-		location: None,
-		bucket: s3_xml::Value(bucket),
-		key: s3_xml::Value(key),
-		etag: s3_xml::Value(etag),
-	};
-	let xml = s3_xml::to_xml_with_header(&result)?;
-
-	Ok(Response::new(Body::from(xml.into_bytes())))
-}
-
-pub async fn handle_abort_multipart_upload(
-	garage: Arc<Garage>,
-	bucket: &str,
-	key: &str,
-	upload_id: &str,
-) -> Result<Response<Body>, Error> {
-	let version_uuid = decode_upload_id(upload_id)?;
-
-	let object = garage
-		.object_table
-		.get(&bucket.to_string(), &key.to_string())
-		.await?;
-	let object = object.ok_or_else(|| Error::BadRequest("Object not found".to_string()))?;
-
-	let object_version = object
-		.versions()
-		.iter()
-		.find(|v| v.uuid == version_uuid && v.is_uploading());
-	let mut object_version = match object_version {
-		None => return Err(Error::NotFound),
-		Some(x) => x.clone(),
-	};
-
-	object_version.state = ObjectVersionState::Aborted;
-	let final_object = Object::new(bucket.to_string(), key.to_string(), vec![object_version]);
-	garage.object_table.insert(&final_object).await?;
-
-	Ok(Response::new(Body::from(vec![])))
-}
-
-fn get_mime_type(req: &Request<Body>) -> Result<String, Error> {
-	Ok(req
-		.headers()
-		.get(hyper::header::CONTENT_TYPE)
-		.map(|x| x.to_str())
-		.unwrap_or(Ok("blob"))?
-		.to_string())
-}
-
-pub(crate) fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, Error> {
-	let content_type = get_mime_type(req)?;
-	let mut other = BTreeMap::new();
-
-	// Preserve standard headers
-	let standard_header = vec![
-		hyper::header::CACHE_CONTROL,
-		hyper::header::CONTENT_DISPOSITION,
-		hyper::header::CONTENT_ENCODING,
-		hyper::header::CONTENT_LANGUAGE,
-		hyper::header::EXPIRES,
-	];
-	for h in standard_header.iter() {
-		if let Some(v) = req.headers().get(h) {
-			match v.to_str() {
-				Ok(v_str) => {
-					other.insert(h.to_string(), v_str.to_string());
-				}
-				Err(e) => {
-					warn!("Discarding header {}, error in .to_str(): {}", h, e);
-				}
-			}
-		}
-	}
-
-	// Preserve x-amz-meta- headers
-	for (k, v) in req.headers().iter() {
-		if k.as_str().starts_with("x-amz-meta-") {
-			match v.to_str() {
-				Ok(v_str) => {
-					other.insert(k.to_string(), v_str.to_string());
-				}
-				Err(e) => {
-					warn!("Discarding header {}, error in .to_str(): {}", k, e);
-				}
-			}
-		}
-	}
-
-	Ok(ObjectVersionHeaders {
-		content_type,
-		other,
-	})
-}
-
-fn decode_upload_id(id: &str) -> Result<Uuid, Error> {
-	let id_bin = hex::decode(id).ok_or_bad_request("Invalid upload ID")?;
-	if id_bin.len() != 32 {
-		return None.ok_or_bad_request("Invalid upload ID");
-	}
-	let mut uuid = [0u8; 32];
-	uuid.copy_from_slice(&id_bin[..]);
-	Ok(Uuid::from(uuid))
-}
-
-#[derive(Debug)]
-struct CompleteMultipartUploadPart {
-	etag: String,
-	part_number: u64,
-}
-
-fn parse_complete_multpart_upload_body(
-	xml: &roxmltree::Document,
-) -> Option<Vec<CompleteMultipartUploadPart>> {
-	let mut parts = vec![];
-
-	let root = xml.root();
-	let cmu = root.first_child()?;
-	if !cmu.has_tag_name("CompleteMultipartUpload") {
-		return None;
-	}
-
-	for item in cmu.children() {
-		if item.has_tag_name("Part") {
-			let etag = item.children().find(|e| e.has_tag_name("ETag"))?.text()?;
-			let part_number = item
-				.children()
-				.find(|e| e.has_tag_name("PartNumber"))?
-				.text()?;
-			parts.push(CompleteMultipartUploadPart {
-				etag: etag.trim_matches('"').to_string(),
-				part_number: part_number.parse().ok()?,
-			});
 		} else {
-			return None;
+			trace!("Successfully validated content-md5");
 		}
 	}
-
+	Ok(())
-	Some(parts)
 }

src/api/s3_xml.rs

@@ -1,629 +0,0 @@
-use quick_xml::se::to_string;
-use serde::{Serialize, Serializer};
-
-use crate::Error as ApiError;
-
-pub fn to_xml_with_header<T: Serialize>(x: &T) -> Result<String, ApiError> {
-	let mut xml = r#"<?xml version="1.0" encoding="UTF-8"?>"#.to_string();
-	xml.push_str(&to_string(x)?);
-	Ok(xml)
-}
-
-fn xmlns_tag<S: Serializer>(_v: &(), s: S) -> Result<S::Ok, S::Error> {
-	s.serialize_str("http://s3.amazonaws.com/doc/2006-03-01/")
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Value(#[serde(rename = "$value")] pub String);
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct IntValue(#[serde(rename = "$value")] pub i64);
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Bucket {
-	#[serde(rename = "CreationDate")]
-	pub creation_date: Value,
-	#[serde(rename = "Name")]
-	pub name: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct DisplayName(#[serde(rename = "$value")] pub String);
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Id(#[serde(rename = "$value")] pub String);
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Owner {
-	#[serde(rename = "DisplayName")]
-	pub display_name: Value,
-	#[serde(rename = "ID")]
-	pub id: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct BucketList {
-	#[serde(rename = "Bucket")]
-	pub entries: Vec<Bucket>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListAllMyBucketsResult {
-	#[serde(rename = "Buckets")]
-	pub buckets: BucketList,
-	#[serde(rename = "Owner")]
-	pub owner: Owner,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct LocationConstraint {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "$value")]
-	pub region: String,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Deleted {
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "VersionId")]
-	pub version_id: Value,
-	#[serde(rename = "DeleteMarkerVersionId")]
-	pub delete_marker_version_id: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct Error {
-	#[serde(rename = "Code")]
-	pub code: Value,
-	#[serde(rename = "Message")]
-	pub message: Value,
-	#[serde(rename = "Resource")]
-	pub resource: Option<Value>,
-	#[serde(rename = "Region")]
-	pub region: Option<Value>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct DeleteError {
-	#[serde(rename = "Code")]
-	pub code: Value,
-	#[serde(rename = "Key")]
-	pub key: Option<Value>,
-	#[serde(rename = "Message")]
-	pub message: Value,
-	#[serde(rename = "VersionId")]
-	pub version_id: Option<Value>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct DeleteResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Deleted")]
-	pub deleted: Vec<Deleted>,
-	#[serde(rename = "Error")]
-	pub errors: Vec<DeleteError>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct CopyObjectResult {
-	#[serde(rename = "LastModified")]
-	pub last_modified: Value,
-	#[serde(rename = "ETag")]
-	pub etag: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct InitiateMultipartUploadResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Bucket")]
-	pub bucket: Value,
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "UploadId")]
-	pub upload_id: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct CompleteMultipartUploadResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Location")]
-	pub location: Option<Value>,
-	#[serde(rename = "Bucket")]
-	pub bucket: Value,
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "ETag")]
-	pub etag: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListBucketItem {
-	#[serde(rename = "Key")]
-	pub key: Value,
-	#[serde(rename = "LastModified")]
-	pub last_modified: Value,
-	#[serde(rename = "ETag")]
-	pub etag: Value,
-	#[serde(rename = "Size")]
-	pub size: IntValue,
-	#[serde(rename = "StorageClass")]
-	pub storage_class: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct CommonPrefix {
-	#[serde(rename = "Prefix")]
-	pub prefix: Value,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct ListBucketResult {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Name")]
-	pub name: Value,
-	#[serde(rename = "Prefix")]
-	pub prefix: Value,
-	#[serde(rename = "Marker")]
-	pub marker: Option<Value>,
-	#[serde(rename = "NextMarker")]
-	pub next_marker: Option<Value>,
-	#[serde(rename = "StartAfter")]
-	pub start_after: Option<Value>,
-	#[serde(rename = "ContinuationToken")]
-	pub continuation_token: Option<Value>,
-	#[serde(rename = "NextContinuationToken")]
-	pub next_continuation_token: Option<Value>,
-	#[serde(rename = "KeyCount")]
-	pub key_count: Option<IntValue>,
-	#[serde(rename = "MaxKeys")]
-	pub max_keys: IntValue,
-	#[serde(rename = "Delimiter")]
-	pub delimiter: Option<Value>,
-	#[serde(rename = "EncodingType")]
-	pub encoding_type: Option<Value>,
-	#[serde(rename = "IsTruncated")]
-	pub is_truncated: Value,
-	#[serde(rename = "Contents")]
-	pub contents: Vec<ListBucketItem>,
-	#[serde(rename = "CommonPrefixes")]
-	pub common_prefixes: Vec<CommonPrefix>,
-}
-
-#[derive(Debug, Serialize, PartialEq)]
-pub struct VersioningConfiguration {
-	#[serde(serialize_with = "xmlns_tag")]
-	pub xmlns: (),
-	#[serde(rename = "Status")]
-	pub status: Option<Value>,
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	use garage_util::time::*;
-
-	#[test]
-	fn error_message() -> Result<(), ApiError> {
-		let error = Error {
-			code: Value("TestError".to_string()),
-			message: Value("A dummy error message".to_string()),
-			resource: Some(Value("/bucket/a/plop".to_string())),
-			region: Some(Value("garage".to_string())),
-		};
-		assert_eq!(
-			to_xml_with_header(&error)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<Error>\
-	<Code>TestError</Code>\
-	<Message>A dummy error message</Message>\
-	<Resource>/bucket/a/plop</Resource>\
-	<Region>garage</Region>\
-</Error>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn list_all_my_buckets_result() -> Result<(), ApiError> {
-		let list_buckets = ListAllMyBucketsResult {
-			owner: Owner {
-				display_name: Value("owner_name".to_string()),
-				id: Value("qsdfjklm".to_string()),
-			},
-			buckets: BucketList {
-				entries: vec![
-					Bucket {
-						creation_date: Value(msec_to_rfc3339(0)),
-						name: Value("bucket_A".to_string()),
-					},
-					Bucket {
-						creation_date: Value(msec_to_rfc3339(3600 * 24 * 1000)),
-						name: Value("bucket_B".to_string()),
-					},
-				],
-			},
-		};
-		assert_eq!(
-			to_xml_with_header(&list_buckets)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListAllMyBucketsResult>\
-   <Buckets>\
-      <Bucket>\
-         <CreationDate>1970-01-01T00:00:00.000Z</CreationDate>\
-         <Name>bucket_A</Name>\
-      </Bucket>\
-      <Bucket>\
-         <CreationDate>1970-01-02T00:00:00.000Z</CreationDate>\
-         <Name>bucket_B</Name>\
-      </Bucket>\
-   </Buckets>\
-   <Owner>\
-      <DisplayName>owner_name</DisplayName>\
-      <ID>qsdfjklm</ID>\
-   </Owner>\
-</ListAllMyBucketsResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn get_bucket_location_result() -> Result<(), ApiError> {
-		let get_bucket_location = LocationConstraint {
-			xmlns: (),
-			region: "garage".to_string(),
-		};
-		assert_eq!(
-			to_xml_with_header(&get_bucket_location)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<LocationConstraint xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">garage</LocationConstraint>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn get_bucket_versioning_result() -> Result<(), ApiError> {
-		let get_bucket_versioning = VersioningConfiguration {
-			xmlns: (),
-			status: None,
-		};
-		assert_eq!(
-			to_xml_with_header(&get_bucket_versioning)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<VersioningConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"/>"
-		);
-		let get_bucket_versioning2 = VersioningConfiguration {
-			xmlns: (),
-			status: Some(Value("Suspended".to_string())),
-		};
-		assert_eq!(
-			to_xml_with_header(&get_bucket_versioning2)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<VersioningConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Status>Suspended</Status></VersioningConfiguration>"
-		);
-
-		Ok(())
-	}
-
-	#[test]
-	fn delete_result() -> Result<(), ApiError> {
-		let delete_result = DeleteResult {
-			xmlns: (),
-			deleted: vec![
-				Deleted {
-					key: Value("a/plop".to_string()),
-					version_id: Value("qsdfjklm".to_string()),
-					delete_marker_version_id: Value("wxcvbn".to_string()),
-				},
-				Deleted {
-					key: Value("b/plip".to_string()),
-					version_id: Value("1234".to_string()),
-					delete_marker_version_id: Value("4321".to_string()),
-				},
-			],
-			errors: vec![
-				DeleteError {
-					code: Value("NotFound".to_string()),
-					key: Some(Value("c/plap".to_string())),
-					message: Value("Object c/plap not found".to_string()),
-					version_id: None,
-				},
-				DeleteError {
-					code: Value("Forbidden".to_string()),
-					key: Some(Value("d/plep".to_string())),
-					message: Value("Not authorized".to_string()),
-					version_id: Some(Value("789".to_string())),
-				},
-			],
-		};
-		assert_eq!(
-			to_xml_with_header(&delete_result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<DeleteResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-    <Deleted>\
-        <Key>a/plop</Key>\
-        <VersionId>qsdfjklm</VersionId>\
-        <DeleteMarkerVersionId>wxcvbn</DeleteMarkerVersionId>\
-    </Deleted>\
-    <Deleted>\
-        <Key>b/plip</Key>\
-        <VersionId>1234</VersionId>\
-        <DeleteMarkerVersionId>4321</DeleteMarkerVersionId>\
-    </Deleted>\
-    <Error>\
-        <Code>NotFound</Code>\
-        <Key>c/plap</Key>\
-        <Message>Object c/plap not found</Message>\
-    </Error>\
-    <Error>\
-        <Code>Forbidden</Code>\
-        <Key>d/plep</Key>\
-        <Message>Not authorized</Message>\
-        <VersionId>789</VersionId>\
-    </Error>\
-</DeleteResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn copy_object_result() -> Result<(), ApiError> {
-		let copy_result = CopyObjectResult {
-			last_modified: Value(msec_to_rfc3339(0)),
-			etag: Value("9b2cf535f27731c974343645a3985328".to_string()),
-		};
-		assert_eq!(
-			to_xml_with_header(&copy_result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<CopyObjectResult>\
-    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>9b2cf535f27731c974343645a3985328</ETag>\
-</CopyObjectResult>\
-			"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn initiate_multipart_upload_result() -> Result<(), ApiError> {
-		let result = InitiateMultipartUploadResult {
-			xmlns: (),
-			bucket: Value("mybucket".to_string()),
-			key: Value("a/plop".to_string()),
-			upload_id: Value("azerty".to_string()),
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<InitiateMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-	<Bucket>mybucket</Bucket>\
-	<Key>a/plop</Key>\
-	<UploadId>azerty</UploadId>\
-</InitiateMultipartUploadResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn complete_multipart_upload_result() -> Result<(), ApiError> {
-		let result = CompleteMultipartUploadResult {
-			xmlns: (),
-			location: Some(Value("https://garage.tld/mybucket/a/plop".to_string())),
-			bucket: Value("mybucket".to_string()),
-			key: Value("a/plop".to_string()),
-			etag: Value("3858f62230ac3c915f300c664312c11f-9".to_string()),
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-	<Location>https://garage.tld/mybucket/a/plop</Location>\
-	<Bucket>mybucket</Bucket>\
-	<Key>a/plop</Key>\
-	<ETag>3858f62230ac3c915f300c664312c11f-9</ETag>\
-</CompleteMultipartUploadResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn list_objects_v1_1() -> Result<(), ApiError> {
-		let result = ListBucketResult {
-			xmlns: (),
-			name: Value("example-bucket".to_string()),
-			prefix: Value("".to_string()),
-			marker: Some(Value("".to_string())),
-			next_marker: None,
-			start_after: None,
-			continuation_token: None,
-			next_continuation_token: None,
-			key_count: None,
-			max_keys: IntValue(1000),
-			encoding_type: None,
-			delimiter: Some(Value("/".to_string())),
-			is_truncated: Value("false".to_string()),
-			contents: vec![ListBucketItem {
-				key: Value("sample.jpg".to_string()),
-				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("bf1d737a4d46a19f3bced6905cc8b902".to_string()),
-				size: IntValue(142863),
-				storage_class: Value("STANDARD".to_string()),
-			}],
-			common_prefixes: vec![CommonPrefix {
-				prefix: Value("photos/".to_string()),
-			}],
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-  <Name>example-bucket</Name>\
-  <Prefix></Prefix>\
-  <Marker></Marker>\
-  <MaxKeys>1000</MaxKeys>\
-  <Delimiter>/</Delimiter>\
-  <IsTruncated>false</IsTruncated>\
-  <Contents>\
-    <Key>sample.jpg</Key>\
-    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>bf1d737a4d46a19f3bced6905cc8b902</ETag>\
-    <Size>142863</Size>\
-    <StorageClass>STANDARD</StorageClass>\
-  </Contents>\
-  <CommonPrefixes>\
-    <Prefix>photos/</Prefix>\
-  </CommonPrefixes>\
-</ListBucketResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn list_objects_v1_2() -> Result<(), ApiError> {
-		let result = ListBucketResult {
-			xmlns: (),
-			name: Value("example-bucket".to_string()),
-			prefix: Value("photos/2006/".to_string()),
-			marker: Some(Value("".to_string())),
-			next_marker: None,
-			start_after: None,
-			continuation_token: None,
-			next_continuation_token: None,
-			key_count: None,
-			max_keys: IntValue(1000),
-			delimiter: Some(Value("/".to_string())),
-			encoding_type: None,
-			is_truncated: Value("false".to_string()),
-			contents: vec![],
-			common_prefixes: vec![
-				CommonPrefix {
-					prefix: Value("photos/2006/February/".to_string()),
-				},
-				CommonPrefix {
-					prefix: Value("photos/2006/January/".to_string()),
-				},
-			],
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-  <Name>example-bucket</Name>\
-  <Prefix>photos/2006/</Prefix>\
-  <Marker></Marker>\
-  <MaxKeys>1000</MaxKeys>\
-  <Delimiter>/</Delimiter>\
-  <IsTruncated>false</IsTruncated>\
-  <CommonPrefixes>\
-    <Prefix>photos/2006/February/</Prefix>\
-  </CommonPrefixes>\
-  <CommonPrefixes>\
-    <Prefix>photos/2006/January/</Prefix>\
-  </CommonPrefixes>\
-</ListBucketResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn list_objects_v2_1() -> Result<(), ApiError> {
-		let result = ListBucketResult {
-			xmlns: (),
-			name: Value("quotes".to_string()),
-			prefix: Value("E".to_string()),
-			marker: None,
-			next_marker: None,
-			start_after: Some(Value("ExampleGuide.pdf".to_string())),
-			continuation_token: None,
-			next_continuation_token: None,
-			key_count: None,
-			max_keys: IntValue(3),
-			delimiter: None,
-			encoding_type: None,
-			is_truncated: Value("false".to_string()),
-			contents: vec![ListBucketItem {
-				key: Value("ExampleObject.txt".to_string()),
-				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("599bab3ed2c697f1d26842727561fd94".to_string()),
-				size: IntValue(857),
-				storage_class: Value("REDUCED_REDUNDANCY".to_string()),
-			}],
-			common_prefixes: vec![],
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-  <Name>quotes</Name>\
-  <Prefix>E</Prefix>\
-  <StartAfter>ExampleGuide.pdf</StartAfter>\
-  <MaxKeys>3</MaxKeys>\
-  <IsTruncated>false</IsTruncated>\
-  <Contents>\
-    <Key>ExampleObject.txt</Key>\
-    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>599bab3ed2c697f1d26842727561fd94</ETag>\
-    <Size>857</Size>\
-    <StorageClass>REDUCED_REDUNDANCY</StorageClass>\
-  </Contents>\
-</ListBucketResult>"
-		);
-		Ok(())
-	}
-
-	#[test]
-	fn list_objects_v2_2() -> Result<(), ApiError> {
-		let result = ListBucketResult {
-			xmlns: (),
-			name: Value("bucket".to_string()),
-			prefix: Value("".to_string()),
-			marker: None,
-			next_marker: None,
-			start_after: None,
-			continuation_token: Some(Value(
-				"1ueGcxLPRx1Tr/XYExHnhbYLgveDs2J/wm36Hy4vbOwM=".to_string(),
-			)),
-			next_continuation_token: Some(Value("qsdfjklm".to_string())),
-			key_count: Some(IntValue(112)),
-			max_keys: IntValue(1000),
-			delimiter: None,
-			encoding_type: None,
-			is_truncated: Value("false".to_string()),
-			contents: vec![ListBucketItem {
-				key: Value("happyfacex.jpg".to_string()),
-				last_modified: Value(msec_to_rfc3339(0)),
-				etag: Value("70ee1738b6b21e2c8a43f3a5ab0eee71".to_string()),
-				size: IntValue(1111),
-				storage_class: Value("STANDARD".to_string()),
-			}],
-			common_prefixes: vec![],
-		};
-		assert_eq!(
-			to_xml_with_header(&result)?,
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
-<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\
-  <Name>bucket</Name>\
-  <Prefix></Prefix>\
-  <ContinuationToken>1ueGcxLPRx1Tr/XYExHnhbYLgveDs2J/wm36Hy4vbOwM=</ContinuationToken>\
-  <NextContinuationToken>qsdfjklm</NextContinuationToken>\
-  <KeyCount>112</KeyCount>\
-  <MaxKeys>1000</MaxKeys>\
-  <IsTruncated>false</IsTruncated>\
-  <Contents>\
-    <Key>happyfacex.jpg</Key>\
-    <LastModified>1970-01-01T00:00:00.000Z</LastModified>\
-    <ETag>70ee1738b6b21e2c8a43f3a5ab0eee71</ETag>\
-    <Size>1111</Size>\
-    <StorageClass>STANDARD</StorageClass>\
-  </Contents>\
-</ListBucketResult>"
-		);
-		Ok(())
-	}
-}

src/api/signature.rs

@@ -43,12 +43,13 @@ pub async fn check_signature(
 	let date = headers
 		.get("x-amz-date")
 		.ok_or_bad_request("Missing X-Amz-Date field")?;
-	let date: NaiveDateTime =
+	let date: NaiveDateTime = NaiveDateTime::parse_from_str(date, LONG_DATETIME)
-		NaiveDateTime::parse_from_str(date, LONG_DATETIME).ok_or_bad_request("Invalid date")?;
+		.ok_or_bad_request("Invalid date")?
+		.into();
 	let date: DateTime<Utc> = DateTime::from_utc(date, Utc);
 
 	if Utc::now() - date > Duration::hours(24) {
-		return Err(Error::BadRequest("Date is too old".to_string()));
+		return Err(Error::BadRequest(format!("Date is too old")));
 	}
 
 	let scope = format!(
@@ -57,7 +58,10 @@ pub async fn check_signature(
 		garage.config.s3_api.s3_region
 	);
 	if authorization.scope != scope {
-		return Err(Error::AuthorizationHeaderMalformed(scope.to_string()));
+		return Err(Error::BadRequest(format!(
+			"Invalid scope in authorization field, expected: {}",
+			scope
+		)));
 	}
 
 	let key = garage
@@ -65,7 +69,10 @@ pub async fn check_signature(
 		.get(&EmptyKey, &authorization.key_id)
 		.await?
 		.filter(|k| !k.deleted.get())
-		.ok_or_else(|| Error::Forbidden(format!("No such key: {}", authorization.key_id)))?;
+		.ok_or(Error::Forbidden(format!(
+			"No such key: {}",
+			authorization.key_id
+		)))?;
 
 	let canonical_request = canonical_request(
 		request.method(),
@@ -91,7 +98,7 @@ pub async fn check_signature(
 		trace!("Canonical request: ``{}``", canonical_request);
 		trace!("String to sign: ``{}``", string_to_sign);
 		trace!("Expected: {}, got: {}", signature, authorization.signature);
-		return Err(Error::Forbidden("Invalid signature".to_string()));
+		return Err(Error::Forbidden(format!("Invalid signature")));
 	}
 
 	let content_sha256 = if authorization.content_sha256 == "UNSIGNED-PAYLOAD" {
@@ -101,7 +108,7 @@ pub async fn check_signature(
 			.ok_or_bad_request("Invalid content sha256 hash")?;
 		Some(
 			Hash::try_from(&bytes[..])
-				.ok_or_else(|| Error::BadRequest("Invalid content sha256 hash".to_string()))?,
+				.ok_or(Error::BadRequest(format!("Invalid content sha256 hash")))?,
 		)
 	};
 
@@ -169,9 +176,9 @@ fn parse_query_authorization(headers: &HashMap<String, String>) -> Result<Author
 		.get("x-amz-algorithm")
 		.ok_or_bad_request("X-Amz-Algorithm not found in query parameters")?;
 	if algo != "AWS4-HMAC-SHA256" {
-		return Err(Error::BadRequest(
+		return Err(Error::BadRequest(format!(
-			"Unsupported authorization method".to_string(),
+			"Unsupported authorization method"
-		));
+		)));
 	}
 
 	let cred = headers
@@ -289,9 +296,9 @@ pub fn verify_signed_content(content_sha256: Option<Hash>, body: &[u8]) -> Resul
 	let expected_sha256 =
 		content_sha256.ok_or_bad_request("Request content hash not signed, aborting.")?;
 	if expected_sha256 != sha256sum(body) {
-		return Err(Error::BadRequest(
+		return Err(Error::BadRequest(format!(
-			"Request content hash does not match signed hash".to_string(),
+			"Request content hash does not match signed hash"
-		));
+		)));
 	}
 	Ok(())
 }

src/garage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "0.3.0"
+version = "0.2.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,12 +14,12 @@ path = "main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_api = { version = "0.3.0", path = "../api" }
+garage_api = { version = "0.2.1", path = "../api" }
-garage_model = { version = "0.3.0", path = "../model" }
+garage_model = { version = "0.2.1", path = "../model" }
-garage_rpc = { version = "0.3.0", path = "../rpc" }
+garage_rpc = { version = "0.2.1", path = "../rpc" }
-garage_table = { version = "0.3.0", path = "../table" }
+garage_table = { version = "0.2.1", path = "../table" }
-garage_util = { version = "0.3.0", path = "../util" }
+garage_util = { version = "0.2.1", path = "../util" }
-garage_web = { version = "0.3.0", path = "../web" }
+garage_web = { version = "0.2.1", path = "../web" }
 
 bytes = "1.0"
 git-version = "0.3.4"

src/garage/admin_rpc.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use garage_util::error::Error;
 
-use garage_table::crdt::Crdt;
+use garage_table::crdt::CRDT;
 use garage_table::replication::*;
 use garage_table::*;
 
@@ -25,7 +25,7 @@ pub const ADMIN_RPC_TIMEOUT: Duration = Duration::from_secs(30);
 pub const ADMIN_RPC_PATH: &str = "_admin";
 
 #[derive(Debug, Serialize, Deserialize)]
-pub enum AdminRpc {
+pub enum AdminRPC {
 	BucketOperation(BucketOperation),
 	KeyOperation(KeyOperation),
 	LaunchRepair(RepairOpt),
@@ -39,35 +39,35 @@ pub enum AdminRpc {
 	KeyInfo(Key),
 }
 
-impl RpcMessage for AdminRpc {}
+impl RpcMessage for AdminRPC {}
 
 pub struct AdminRpcHandler {
 	garage: Arc<Garage>,
-	rpc_client: Arc<RpcClient<AdminRpc>>,
+	rpc_client: Arc<RpcClient<AdminRPC>>,
 }
 
 impl AdminRpcHandler {
 	pub fn new(garage: Arc<Garage>) -> Arc<Self> {
-		let rpc_client = garage.system.clone().rpc_client::<AdminRpc>(ADMIN_RPC_PATH);
+		let rpc_client = garage.system.clone().rpc_client::<AdminRPC>(ADMIN_RPC_PATH);
 		Arc::new(Self { garage, rpc_client })
 	}
 
 	pub fn register_handler(self: Arc<Self>, rpc_server: &mut RpcServer) {
-		rpc_server.add_handler::<AdminRpc, _, _>(ADMIN_RPC_PATH.to_string(), move |msg, _addr| {
+		rpc_server.add_handler::<AdminRPC, _, _>(ADMIN_RPC_PATH.to_string(), move |msg, _addr| {
 			let self2 = self.clone();
 			async move {
 				match msg {
-					AdminRpc::BucketOperation(bo) => self2.handle_bucket_cmd(bo).await,
+					AdminRPC::BucketOperation(bo) => self2.handle_bucket_cmd(bo).await,
-					AdminRpc::KeyOperation(ko) => self2.handle_key_cmd(ko).await,
+					AdminRPC::KeyOperation(ko) => self2.handle_key_cmd(ko).await,
-					AdminRpc::LaunchRepair(opt) => self2.handle_launch_repair(opt).await,
+					AdminRPC::LaunchRepair(opt) => self2.handle_launch_repair(opt).await,
-					AdminRpc::Stats(opt) => self2.handle_stats(opt).await,
+					AdminRPC::Stats(opt) => self2.handle_stats(opt).await,
-					_ => Err(Error::BadRpc("Invalid RPC".to_string())),
+					_ => Err(Error::BadRPC(format!("Invalid RPC"))),
 				}
 			}
 		});
 	}
 
-	async fn handle_bucket_cmd(&self, cmd: BucketOperation) -> Result<AdminRpc, Error> {
+	async fn handle_bucket_cmd(&self, cmd: BucketOperation) -> Result<AdminRPC, Error> {
 		match cmd {
 			BucketOperation::List => {
 				let bucket_names = self
@@ -78,17 +78,17 @@ impl AdminRpcHandler {
 					.iter()
 					.map(|b| b.name.to_string())
 					.collect::<Vec<_>>();
-				Ok(AdminRpc::BucketList(bucket_names))
+				Ok(AdminRPC::BucketList(bucket_names))
 			}
 			BucketOperation::Info(query) => {
 				let bucket = self.get_existing_bucket(&query.name).await?;
-				Ok(AdminRpc::BucketInfo(bucket))
+				Ok(AdminRPC::BucketInfo(bucket))
 			}
 			BucketOperation::Create(query) => {
 				let bucket = match self.garage.bucket_table.get(&EmptyKey, &query.name).await? {
 					Some(mut bucket) => {
 						if !bucket.is_deleted() {
-							return Err(Error::BadRpc(format!(
+							return Err(Error::BadRPC(format!(
 								"Bucket {} already exists",
 								query.name
 							)));
@@ -101,7 +101,7 @@ impl AdminRpcHandler {
 					None => Bucket::new(query.name.clone()),
 				};
 				self.garage.bucket_table.insert(&bucket).await?;
-				Ok(AdminRpc::Ok(format!("Bucket {} was created.", query.name)))
+				Ok(AdminRPC::Ok(format!("Bucket {} was created.", query.name)))
 			}
 			BucketOperation::Delete(query) => {
 				let mut bucket = self.get_existing_bucket(&query.name).await?;
@@ -111,12 +111,12 @@ impl AdminRpcHandler {
 					.get_range(&query.name, None, Some(DeletedFilter::NotDeleted), 10)
 					.await?;
 				if !objects.is_empty() {
-					return Err(Error::BadRpc(format!("Bucket {} is not empty", query.name)));
+					return Err(Error::BadRPC(format!("Bucket {} is not empty", query.name)));
 				}
 				if !query.yes {
-					return Err(Error::BadRpc(
+					return Err(Error::BadRPC(format!(
-						"Add --yes flag to really perform this operation".to_string(),
+						"Add --yes flag to really perform this operation"
-					));
+					)));
 				}
 				// --- done checking, now commit ---
 				for (key_id, _, _) in bucket.authorized_keys() {
@@ -131,7 +131,7 @@ impl AdminRpcHandler {
 				}
 				bucket.state.update(BucketState::Deleted);
 				self.garage.bucket_table.insert(&bucket).await?;
-				Ok(AdminRpc::Ok(format!("Bucket {} was deleted.", query.name)))
+				Ok(AdminRPC::Ok(format!("Bucket {} was deleted.", query.name)))
 			}
 			BucketOperation::Allow(query) => {
 				let key = self.get_existing_key(&query.key_pattern).await?;
@@ -142,7 +142,7 @@ impl AdminRpcHandler {
 					.await?;
 				self.update_bucket_key(bucket, &key.key_id, allow_read, allow_write)
 					.await?;
-				Ok(AdminRpc::Ok(format!(
+				Ok(AdminRPC::Ok(format!(
 					"New permissions for {} on {}: read {}, write {}.",
 					&key.key_id, &query.bucket, allow_read, allow_write
 				)))
@@ -156,7 +156,7 @@ impl AdminRpcHandler {
 					.await?;
 				self.update_bucket_key(bucket, &key.key_id, allow_read, allow_write)
 					.await?;
-				Ok(AdminRpc::Ok(format!(
+				Ok(AdminRPC::Ok(format!(
 					"New permissions for {} on {}: read {}, write {}.",
 					&key.key_id, &query.bucket, allow_read, allow_write
 				)))
@@ -165,9 +165,9 @@ impl AdminRpcHandler {
 				let mut bucket = self.get_existing_bucket(&query.bucket).await?;
 
 				if !(query.allow ^ query.deny) {
-					return Err(Error::Message(
+					return Err(Error::Message(format!(
-						"You must specify exactly one flag, either --allow or --deny".to_string(),
+						"You must specify exactly one flag, either --allow or --deny"
-					));
+					)));
 				}
 
 				if let BucketState::Present(state) = bucket.state.get_mut() {
@@ -179,7 +179,7 @@ impl AdminRpcHandler {
 						format!("Website access denied for {}", &query.bucket)
 					};
 
-					Ok(AdminRpc::Ok(msg))
+					Ok(AdminRPC::Ok(msg.to_string()))
 				} else {
 					unreachable!();
 				}
@@ -187,7 +187,7 @@ impl AdminRpcHandler {
 		}
 	}
 
-	async fn handle_key_cmd(&self, cmd: KeyOperation) -> Result<AdminRpc, Error> {
+	async fn handle_key_cmd(&self, cmd: KeyOperation) -> Result<AdminRPC, Error> {
 		match cmd {
 			KeyOperation::List => {
 				let key_ids = self
@@ -203,29 +203,29 @@ impl AdminRpcHandler {
 					.iter()
 					.map(|k| (k.key_id.to_string(), k.name.get().clone()))
 					.collect::<Vec<_>>();
-				Ok(AdminRpc::KeyList(key_ids))
+				Ok(AdminRPC::KeyList(key_ids))
 			}
 			KeyOperation::Info(query) => {
 				let key = self.get_existing_key(&query.key_pattern).await?;
-				Ok(AdminRpc::KeyInfo(key))
+				Ok(AdminRPC::KeyInfo(key))
 			}
 			KeyOperation::New(query) => {
 				let key = Key::new(query.name);
 				self.garage.key_table.insert(&key).await?;
-				Ok(AdminRpc::KeyInfo(key))
+				Ok(AdminRPC::KeyInfo(key))
 			}
 			KeyOperation::Rename(query) => {
 				let mut key = self.get_existing_key(&query.key_pattern).await?;
 				key.name.update(query.new_name);
 				self.garage.key_table.insert(&key).await?;
-				Ok(AdminRpc::KeyInfo(key))
+				Ok(AdminRPC::KeyInfo(key))
 			}
 			KeyOperation::Delete(query) => {
 				let key = self.get_existing_key(&query.key_pattern).await?;
 				if !query.yes {
-					return Err(Error::BadRpc(
+					return Err(Error::BadRPC(format!(
-						"Add --yes flag to really perform this operation".to_string(),
+						"Add --yes flag to really perform this operation"
-					));
+					)));
 				}
 				// --- done checking, now commit ---
 				for (ab_name, _, _) in key.authorized_buckets.items().iter() {
@@ -240,7 +240,7 @@ impl AdminRpcHandler {
 				}
 				let del_key = Key::delete(key.key_id.to_string());
 				self.garage.key_table.insert(&del_key).await?;
-				Ok(AdminRpc::Ok(format!(
+				Ok(AdminRPC::Ok(format!(
 					"Key {} was deleted successfully.",
 					key.key_id
 				)))
@@ -252,12 +252,11 @@ impl AdminRpcHandler {
 				}
 				let imported_key = Key::import(&query.key_id, &query.secret_key, &query.name);
 				self.garage.key_table.insert(&imported_key).await?;
-				Ok(AdminRpc::KeyInfo(imported_key))
+				Ok(AdminRPC::KeyInfo(imported_key))
 			}
 		}
 	}
 
-	#[allow(clippy::ptr_arg)]
 	async fn get_existing_bucket(&self, bucket: &String) -> Result<Bucket, Error> {
 		self.garage
 			.bucket_table
@@ -265,7 +264,10 @@ impl AdminRpcHandler {
 			.await?
 			.filter(|b| !b.is_deleted())
 			.map(Ok)
-			.unwrap_or_else(|| Err(Error::BadRpc(format!("Bucket {} does not exist", bucket))))
+			.unwrap_or(Err(Error::BadRPC(format!(
+				"Bucket {} does not exist",
+				bucket
+			))))
 	}
 
 	async fn get_existing_key(&self, pattern: &str) -> Result<Key, Error> {
@@ -296,7 +298,7 @@ impl AdminRpcHandler {
 	async fn update_bucket_key(
 		&self,
 		mut bucket: Bucket,
-		key_id: &str,
+		key_id: &String,
 		allow_read: bool,
 		allow_write: bool,
 	) -> Result<(), Error> {
@@ -311,9 +313,9 @@ impl AdminRpcHandler {
 				},
 			));
 		} else {
-			return Err(Error::Message(
+			return Err(Error::Message(format!(
-				"Bucket is deleted in update_bucket_key".to_string(),
+				"Bucket is deleted in update_bucket_key"
-			));
+			)));
 		}
 		self.garage.bucket_table.insert(&bucket).await?;
 		Ok(())
@@ -323,14 +325,14 @@ impl AdminRpcHandler {
 	async fn update_key_bucket(
 		&self,
 		key: &Key,
-		bucket: &str,
+		bucket: &String,
 		allow_read: bool,
 		allow_write: bool,
 	) -> Result<(), Error> {
 		let mut key = key.clone();
 		let old_map = key.authorized_buckets.take_and_clear();
 		key.authorized_buckets.merge(&old_map.update_mutator(
-			bucket.to_string(),
+			bucket.clone(),
 			PermissionSet {
 				allow_read,
 				allow_write,
@@ -340,11 +342,11 @@ impl AdminRpcHandler {
 		Ok(())
 	}
 
-	async fn handle_launch_repair(self: &Arc<Self>, opt: RepairOpt) -> Result<AdminRpc, Error> {
+	async fn handle_launch_repair(self: &Arc<Self>, opt: RepairOpt) -> Result<AdminRPC, Error> {
 		if !opt.yes {
-			return Err(Error::BadRpc(
+			return Err(Error::BadRPC(format!(
-				"Please provide the --yes flag to initiate repair operations.".to_string(),
+				"Please provide the --yes flag to initiate repair operations."
-			));
+			)));
 		}
 		if opt.all_nodes {
 			let mut opt_to_send = opt.clone();
@@ -357,17 +359,17 @@ impl AdminRpcHandler {
 					.rpc_client
 					.call(
 						*node,
-						AdminRpc::LaunchRepair(opt_to_send.clone()),
+						AdminRPC::LaunchRepair(opt_to_send.clone()),
 						ADMIN_RPC_TIMEOUT,
 					)
 					.await
 					.is_err()
 				{
-					failures.push(*node);
+					failures.push(node.clone());
 				}
 			}
 			if failures.is_empty() {
-				Ok(AdminRpc::Ok("Repair launched on all nodes".to_string()))
+				Ok(AdminRPC::Ok(format!("Repair launched on all nodes")))
 			} else {
 				Err(Error::Message(format!(
 					"Could not launch repair on nodes: {:?} (launched successfully on other nodes)",
@@ -384,14 +386,14 @@ impl AdminRpcHandler {
 				.spawn_worker("Repair worker".into(), move |must_exit| async move {
 					repair.repair_worker(opt, must_exit).await
 				});
-			Ok(AdminRpc::Ok(format!(
+			Ok(AdminRPC::Ok(format!(
 				"Repair launched on {:?}",
 				self.garage.system.id
 			)))
 		}
 	}
 
-	async fn handle_stats(&self, opt: StatsOpt) -> Result<AdminRpc, Error> {
+	async fn handle_stats(&self, opt: StatsOpt) -> Result<AdminRPC, Error> {
 		if opt.all_nodes {
 			let mut ret = String::new();
 			let ring = self.garage.system.ring.borrow().clone();
@@ -404,21 +406,21 @@ impl AdminRpcHandler {
 				writeln!(&mut ret, "Stats for node {:?}:", node).unwrap();
 				match self
 					.rpc_client
-					.call(*node, AdminRpc::Stats(opt), ADMIN_RPC_TIMEOUT)
+					.call(*node, AdminRPC::Stats(opt), ADMIN_RPC_TIMEOUT)
 					.await
 				{
-					Ok(AdminRpc::Ok(s)) => writeln!(&mut ret, "{}", s).unwrap(),
+					Ok(AdminRPC::Ok(s)) => writeln!(&mut ret, "{}", s).unwrap(),
 					Ok(x) => writeln!(&mut ret, "Bad answer: {:?}", x).unwrap(),
 					Err(e) => writeln!(&mut ret, "Error: {}", e).unwrap(),
 				}
 			}
-			Ok(AdminRpc::Ok(ret))
+			Ok(AdminRPC::Ok(ret))
 		} else {
-			Ok(AdminRpc::Ok(self.gather_stats_local(opt)))
+			Ok(AdminRPC::Ok(self.gather_stats_local(opt)?))
 		}
 	}
 
-	fn gather_stats_local(&self, opt: StatsOpt) -> String {
+	fn gather_stats_local(&self, opt: StatsOpt) -> Result<String, Error> {
 		let mut ret = String::new();
 		writeln!(
 			&mut ret,
@@ -430,8 +432,8 @@ impl AdminRpcHandler {
 		// Gather ring statistics
 		let ring = self.garage.system.ring.borrow().clone();
 		let mut ring_nodes = HashMap::new();
-		for (_i, loc) in ring.partitions().iter() {
+		for r in ring.ring.iter() {
-			for n in ring.get_nodes(loc, ring.replication_factor).iter() {
+			for n in r.nodes.iter() {
 				if !ring_nodes.contains_key(n) {
 					ring_nodes.insert(*n, 0usize);
 				}
@@ -443,11 +445,11 @@ impl AdminRpcHandler {
 			writeln!(&mut ret, "  {:?} {}", n, c).unwrap();
 		}
 
-		self.gather_table_stats(&mut ret, &self.garage.bucket_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.bucket_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.key_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.key_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.object_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.object_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.version_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.version_table, &opt)?;
-		self.gather_table_stats(&mut ret, &self.garage.block_ref_table, &opt);
+		self.gather_table_stats(&mut ret, &self.garage.block_ref_table, &opt)?;
 
 		writeln!(&mut ret, "\nBlock manager stats:").unwrap();
 		if opt.detailed {
@@ -465,10 +467,15 @@ impl AdminRpcHandler {
 		)
 		.unwrap();
 
-		ret
+		Ok(ret)
 	}
 
-	fn gather_table_stats<F, R>(&self, to: &mut String, t: &Arc<Table<F, R>>, opt: &StatsOpt)
+	fn gather_table_stats<F, R>(
+		&self,
+		to: &mut String,
+		t: &Arc<Table<F, R>>,
+		opt: &StatsOpt,
+	) -> Result<(), Error>
 	where
 		F: TableSchema + 'static,
 		R: TableReplication + 'static,
@@ -490,5 +497,6 @@ impl AdminRpcHandler {
 		)
 		.unwrap();
 		writeln!(to, "  GC todo queue length: {}", t.data.gc_todo_len()).unwrap();
+		Ok(())
 	}
 }

src/garage/cli.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 use structopt::StructOpt;
 
-use garage_util::data::Uuid;
+use garage_util::data::UUID;
 use garage_util::error::Error;
 use garage_util::time::*;
 
@@ -72,18 +72,14 @@ pub struct ConfigureNodeOpt {
 	/// Node to configure (prefix of hexadecimal node id)
 	node_id: String,
 
-	/// Location (zone or datacenter) of the node
+	/// Location (datacenter) of the node
-	#[structopt(short = "z", long = "zone")]
+	#[structopt(short = "d", long = "datacenter")]
-	zone: Option<String>,
+	datacenter: Option<String>,
 
 	/// Capacity (in relative terms, use 1 to represent your smallest server)
 	#[structopt(short = "c", long = "capacity")]
 	capacity: Option<u32>,
 
-	/// Gateway-only node
-	#[structopt(short = "g", long = "gateway")]
-	gateway: bool,
-
 	/// Optional node tag
 	#[structopt(short = "t", long = "tag")]
 	tag: Option<String>,
@@ -298,7 +294,7 @@ pub struct StatsOpt {
 pub async fn cli_cmd(
 	cmd: Command,
 	membership_rpc_cli: RpcAddrClient<Message>,
-	admin_rpc_cli: RpcAddrClient<AdminRpc>,
+	admin_rpc_cli: RpcAddrClient<AdminRPC>,
 	rpc_host: SocketAddr,
 ) -> Result<(), Error> {
 	match cmd {
@@ -310,11 +306,11 @@ pub async fn cli_cmd(
 			cmd_remove(membership_rpc_cli, rpc_host, remove_opt).await
 		}
 		Command::Bucket(bo) => {
-			cmd_admin(admin_rpc_cli, rpc_host, AdminRpc::BucketOperation(bo)).await
+			cmd_admin(admin_rpc_cli, rpc_host, AdminRPC::BucketOperation(bo)).await
 		}
-		Command::Key(ko) => cmd_admin(admin_rpc_cli, rpc_host, AdminRpc::KeyOperation(ko)).await,
+		Command::Key(ko) => cmd_admin(admin_rpc_cli, rpc_host, AdminRPC::KeyOperation(ko)).await,
-		Command::Repair(ro) => cmd_admin(admin_rpc_cli, rpc_host, AdminRpc::LaunchRepair(ro)).await,
+		Command::Repair(ro) => cmd_admin(admin_rpc_cli, rpc_host, AdminRPC::LaunchRepair(ro)).await,
-		Command::Stats(so) => cmd_admin(admin_rpc_cli, rpc_host, AdminRpc::Stats(so)).await,
+		Command::Stats(so) => cmd_admin(admin_rpc_cli, rpc_host, AdminRPC::Stats(so)).await,
 		_ => unreachable!(),
 	}
 }
@@ -343,12 +339,7 @@ pub async fn cmd_status(
 		if let Some(cfg) = config.members.get(&adv.id) {
 			println!(
 				"{:?}\t{}\t{}\t[{}]\t{}\t{}",
-				adv.id,
+				adv.id, adv.state_info.hostname, adv.addr, cfg.tag, cfg.datacenter, cfg.capacity
-				adv.state_info.hostname,
-				adv.addr,
-				cfg.tag,
-				cfg.zone,
-				cfg.capacity_string()
 			);
 		} else {
 			println!(
@@ -374,8 +365,8 @@ pub async fn cmd_status(
 					adv.state_info.hostname,
 					adv.addr,
 					cfg.tag,
-					cfg.zone,
+					cfg.datacenter,
-					cfg.capacity_string(),
+					cfg.capacity,
 					(now_msec() - adv.last_seen) / 1000,
 				);
 			}
@@ -384,10 +375,7 @@ pub async fn cmd_status(
 			if !status.iter().any(|x| x.id == *id) {
 				println!(
 					"{:?}\t{}\t{}\t{}\tnever seen",
-					id,
+					id, cfg.tag, cfg.datacenter, cfg.capacity
-					cfg.tag,
-					cfg.zone,
-					cfg.capacity_string(),
 				);
 			}
 		}
@@ -397,9 +385,9 @@ pub async fn cmd_status(
 }
 
 pub fn find_matching_node(
-	cand: impl std::iter::Iterator<Item = Uuid>,
+	cand: impl std::iter::Iterator<Item = UUID>,
 	pattern: &str,
-) -> Result<Uuid, Error> {
+) -> Result<UUID, Error> {
 	let mut candidates = vec![];
 	for c in cand {
 		if hex::encode(&c).starts_with(&pattern) {
@@ -450,40 +438,21 @@ pub async fn cmd_configure(
 		}
 	}
 
-	if args.capacity.is_some() && args.gateway {
-		return Err(Error::Message(
-				"-c and -g are mutually exclusive, please configure node either with c>0 to act as a storage node or with -g to act as a gateway node".into()));
-	}
-	if args.capacity == Some(0) {
-		return Err(Error::Message("Invalid capacity value: 0".into()));
-	}
-
 	let new_entry = match config.members.get(&added_node) {
-		None => {
+		None => NetworkConfigEntry {
-			let capacity = match args.capacity {
+			datacenter: args
-				Some(c) => Some(c),
+				.datacenter
-				None if args.gateway => None,
+				.expect("Please specifiy a datacenter with the -d flag"),
-				_ => return Err(Error::Message(
+			capacity: args
-						"Please specify a capacity with the -c flag, or set node explicitly as gateway with -g".into())),
+				.capacity
-			};
+				.expect("Please specifiy a capacity with the -c flag"),
-			NetworkConfigEntry {
+			tag: args.tag.unwrap_or("".to_string()),
-				zone: args.zone.expect("Please specifiy a zone with the -z flag"),
+		},
-				capacity,
+		Some(old) => NetworkConfigEntry {
-				tag: args.tag.unwrap_or_default(),
+			datacenter: args.datacenter.unwrap_or(old.datacenter.to_string()),
-			}
+			capacity: args.capacity.unwrap_or(old.capacity),
-		}
+			tag: args.tag.unwrap_or(old.tag.to_string()),
-		Some(old) => {
+		},
-			let capacity = match args.capacity {
-				Some(c) => Some(c),
-				None if args.gateway => None,
-				_ => old.capacity,
-			};
-			NetworkConfigEntry {
-				zone: args.zone.unwrap_or_else(|| old.zone.to_string()),
-				capacity,
-				tag: args.tag.unwrap_or_else(|| old.tag.to_string()),
-			}
-		}
 	};
 
 	config.members.insert(added_node, new_entry);
@@ -535,30 +504,30 @@ pub async fn cmd_remove(
 }
 
 pub async fn cmd_admin(
-	rpc_cli: RpcAddrClient<AdminRpc>,
+	rpc_cli: RpcAddrClient<AdminRPC>,
 	rpc_host: SocketAddr,
-	args: AdminRpc,
+	args: AdminRPC,
 ) -> Result<(), Error> {
 	match rpc_cli.call(&rpc_host, args, ADMIN_RPC_TIMEOUT).await?? {
-		AdminRpc::Ok(msg) => {
+		AdminRPC::Ok(msg) => {
 			println!("{}", msg);
 		}
-		AdminRpc::BucketList(bl) => {
+		AdminRPC::BucketList(bl) => {
 			println!("List of buckets:");
 			for bucket in bl {
 				println!("{}", bucket);
 			}
 		}
-		AdminRpc::BucketInfo(bucket) => {
+		AdminRPC::BucketInfo(bucket) => {
 			print_bucket_info(&bucket);
 		}
-		AdminRpc::KeyList(kl) => {
+		AdminRPC::KeyList(kl) => {
 			println!("List of keys:");
 			for key in kl {
 				println!("{}\t{}", key.0, key.1);
 			}
 		}
-		AdminRpc::KeyInfo(key) => {
+		AdminRPC::KeyInfo(key) => {
 			print_key_info(&key);
 		}
 		r => {

src/garage/server.rs

@@ -25,7 +25,7 @@ async fn shutdown_signal(send_cancel: watch::Sender<bool>) -> Result<(), Error>
 	Ok(())
 }
 
-async fn wait_from(mut chan: watch::Receiver<bool>) {
+async fn wait_from(mut chan: watch::Receiver<bool>) -> () {
 	while !*chan.borrow() {
 		if chan.changed().await.is_err() {
 			return;
@@ -40,15 +40,10 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 	info!("Opening database...");
 	let mut db_path = config.metadata_dir.clone();
 	db_path.push("db");
-	let db = sled::Config::default()
+	let db = sled::open(&db_path).expect("Unable to open sled DB");
-		.path(&db_path)
-		.cache_capacity(config.sled_cache_capacity)
-		.flush_every_ms(Some(config.sled_flush_every_ms))
-		.open()
-		.expect("Unable to open sled DB");
 
 	info!("Initialize RPC server...");
-	let mut rpc_server = RpcServer::new(config.rpc_bind_addr, config.rpc_tls.clone());
+	let mut rpc_server = RpcServer::new(config.rpc_bind_addr.clone(), config.rpc_tls.clone());
 
 	info!("Initializing background runner...");
 	let (send_cancel, watch_cancel) = watch::channel(false);
@@ -71,9 +66,9 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
 	let web_server = run_web_server(garage, wait_from(watch_cancel.clone()));
 
 	futures::try_join!(
-		bootstrap.map(|()| {
+		bootstrap.map(|rv| {
 			info!("Bootstrap done");
-			Ok(())
+			Ok(rv)
 		}),
 		run_rpc_server.map(|rv| {
 			info!("RPC server exited");

src/model/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "0.3.0"
+version = "0.2.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,16 +13,16 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_rpc = { version = "0.3.0", path = "../rpc" }
+garage_rpc = { version = "0.2.1", path = "../rpc" }
-garage_table = { version = "0.3.0", path = "../table" }
+garage_table = { version = "0.2.1", path = "../table" }
-garage_util = { version = "0.3.0", path = "../util" }
+garage_util = { version = "0.2.1", path = "../util" }
 
 arc-swap = "1.0"
 hex = "0.4"
 log = "0.4"
 rand = "0.8"
-
 sled = "0.34"
+zstd = "0.6.1"
 
 rmp-serde = "0.15"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }

src/model/block.rs

@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize};
 use tokio::fs;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::sync::{watch, Mutex, Notify};
+use zstd::stream::{decode_all as zstd_decode, Encoder};
 
 use garage_util::data::*;
 use garage_util::error::Error;
@@ -42,22 +43,37 @@ pub enum Message {
 	GetBlock(Hash),
 	/// Message to send a block of data, either because requested, of for first delivery of new
 	/// block
-	PutBlock(PutBlockMessage),
+	PutBlock {
+		hash: Hash,
+		data: BlockData,
+	},
 	/// Ask other node if they should have this block, but don't actually have it
 	NeedBlockQuery(Hash),
 	/// Response : whether the node do require that block
 	NeedBlockReply(bool),
 }
 
-/// Structure used to send a block
+/// A possibly compressed block of data
 #[derive(Debug, Serialize, Deserialize)]
-pub struct PutBlockMessage {
+pub enum BlockData {
-	/// Hash of the block
+	Plain(#[serde(with = "serde_bytes")] Vec<u8>),
-	pub hash: Hash,
+	Compressed(#[serde(with = "serde_bytes")] Vec<u8>),
+}
 
-	/// Content of the block
+impl BlockData {
-	#[serde(with = "serde_bytes")]
+	pub fn is_compressed(&self) -> bool {
-	pub data: Vec<u8>,
+		match self {
+			BlockData::Plain(_) => false,
+			BlockData::Compressed(_) => true,
+		}
+	}
+
+	pub fn buffer(&self) -> &Vec<u8> {
+		match self {
+			BlockData::Plain(b) => b,
+			BlockData::Compressed(b) => b,
+		}
+	}
 }
 
 impl RpcMessage for Message {}
@@ -134,10 +150,10 @@ impl BlockManager {
 
 	async fn handle(self: Arc<Self>, msg: &Message) -> Result<Message, Error> {
 		match msg {
-			Message::PutBlock(m) => self.write_block(&m.hash, &m.data).await,
+			Message::PutBlock { hash, data } => self.write_block(&hash, &data).await,
 			Message::GetBlock(h) => self.read_block(h).await,
 			Message::NeedBlockQuery(h) => self.need_block(h).await.map(Message::NeedBlockReply),
-			_ => Err(Error::BadRpc("Unexpected RPC message".to_string())),
+			_ => Err(Error::BadRPC(format!("Unexpected RPC message"))),
 		}
 	}
 
@@ -157,54 +173,96 @@ impl BlockManager {
 	}
 
 	/// Write a block to disk
-	async fn write_block(&self, hash: &Hash, data: &[u8]) -> Result<Message, Error> {
+	pub async fn write_block(&self, hash: &Hash, data: &BlockData) -> Result<Message, Error> {
+		let mut path = self.block_dir(hash);
+
 		let _lock = self.data_dir_lock.lock().await;
 
-		let mut path = self.block_dir(hash);
+		let clean_plain = match self.is_block_compressed(hash).await {
-		fs::create_dir_all(&path).await?;
+			Ok(true) => return Ok(Message::Ok),
+			Ok(false) if !data.is_compressed() => return Ok(Message::Ok), // we have a plain block, and the provided block is not compressed either
+			Ok(false) => true,
+			Err(_) => false,
+		};
 
+		fs::create_dir_all(&path).await?;
 		path.push(hex::encode(hash));
-		if fs::metadata(&path).await.is_ok() {
+
-			return Ok(Message::Ok);
+		if data.is_compressed() {
+			path.set_extension("zst");
 		}
 
-		let mut f = fs::File::create(path).await?;
+		let buffer = data.buffer();
-		f.write_all(data).await?;
+
+		let mut f = fs::File::create(path.clone()).await?;
+		f.write_all(&buffer).await?;
 		drop(f);
 
+		if clean_plain {
+			path.set_extension("");
+			fs::remove_file(path).await?;
+		}
+
 		Ok(Message::Ok)
 	}
 
 	/// Read block from disk, verifying it's integrity
-	async fn read_block(&self, hash: &Hash) -> Result<Message, Error> {
+	pub async fn read_block(&self, hash: &Hash) -> Result<Message, Error> {
-		let path = self.block_path(hash);
+		let mut path = self.block_path(hash);
 
-		let mut f = match fs::File::open(&path).await {
+		let mut data = vec![];
-			Ok(f) => f,
+		let block = match self.is_block_compressed(hash).await {
-			Err(e) => {
+			Ok(false) => {
+				let f = fs::File::open(&path).await;
+				f.map(|f| (f, false)).map_err(Into::into)
+			}
+			Ok(true) => {
+				path.set_extension("zst");
+				let f = fs::File::open(&path).await;
+				f.map(|f| (f, true)).map_err(Into::into)
+			}
+			Err(e) => Err(e),
+		};
+		let (mut f, compressed) = match block {
+			Ok(ok) => ok,
+			e => {
 				// Not found but maybe we should have had it ??
 				self.put_to_resync(hash, Duration::from_millis(0))?;
-				return Err(Into::into(e));
+				e?
 			}
 		};
-		let mut data = vec![];
 		f.read_to_end(&mut data).await?;
 		drop(f);
 
-		if blake2sum(&data[..]) != *hash {
+		let sum_ok = if compressed {
+			zstd_check_checksum(&data[..])
+		} else {
+			blake2sum(&data[..]) == *hash
+		};
+		if !sum_ok {
 			let _lock = self.data_dir_lock.lock().await;
 			warn!(
 				"Block {:?} is corrupted. Renaming to .corrupted and resyncing.",
 				hash
 			);
 			let mut path2 = path.clone();
-			path2.set_extension(".corrupted");
+			path2.set_extension("corrupted");
 			fs::rename(path, path2).await?;
 			self.put_to_resync(&hash, Duration::from_millis(0))?;
 			return Err(Error::CorruptData(*hash));
 		}
 
-		Ok(Message::PutBlock(PutBlockMessage { hash: *hash, data }))
+		if compressed {
+			Ok(Message::PutBlock {
+				hash: *hash,
+				data: BlockData::Compressed(data),
+			})
+		} else {
+			Ok(Message::PutBlock {
+				hash: *hash,
+				data: BlockData::Plain(data),
+			})
+		}
 	}
 
 	/// Check if this node should have a block, but don't actually have it
@@ -215,14 +273,23 @@ impl BlockManager {
 			.map(|x| u64_from_be_bytes(x) > 0)
 			.unwrap_or(false);
 		if needed {
-			let path = self.block_path(hash);
+			let exists = self.is_block_compressed(hash).await.is_ok();
-			let exists = fs::metadata(&path).await.is_ok();
 			Ok(!exists)
 		} else {
 			Ok(false)
 		}
 	}
 
+	async fn is_block_compressed(&self, hash: &Hash) -> Result<bool, Error> {
+		let mut path = self.block_path(hash);
+		path.set_extension("zst");
+		if fs::metadata(&path).await.is_ok() {
+			return Ok(true);
+		}
+		path.set_extension("");
+		fs::metadata(&path).await.map(|_| false).map_err(Into::into)
+	}
+
 	fn block_dir(&self, hash: &Hash) -> PathBuf {
 		let mut path = self.data_dir.clone();
 		path.push(hex::encode(&hash.as_slice()[0..1]));
@@ -280,8 +347,8 @@ impl BlockManager {
 			if let Err(e) = self.resync_iter(&mut must_exit).await {
 				warn!("Error in block resync loop: {}", e);
 				select! {
-					_ = tokio::time::sleep(Duration::from_secs(1)).fuse() => {},
+					_ = tokio::time::sleep(Duration::from_secs(1)).fuse() => (),
-					_ = must_exit.changed().fuse() => {},
+					_ = must_exit.changed().fuse() => (),
 				}
 			}
 		}
@@ -304,15 +371,15 @@ impl BlockManager {
 			} else {
 				let delay = tokio::time::sleep(Duration::from_millis(time_msec - now));
 				select! {
-					_ = delay.fuse() => {},
+					_ = delay.fuse() => (),
-					_ = self.resync_notify.notified().fuse() => {},
+					_ = self.resync_notify.notified().fuse() => (),
-					_ = must_exit.changed().fuse() => {},
+					_ = must_exit.changed().fuse() => (),
 				}
 			}
 		} else {
 			select! {
-				_ = self.resync_notify.notified().fuse() => {},
+				_ = self.resync_notify.notified().fuse() => (),
-				_ = must_exit.changed().fuse() => {},
+				_ = must_exit.changed().fuse() => (),
 			}
 		}
 		Ok(())
@@ -323,7 +390,7 @@ impl BlockManager {
 
 		let path = self.block_path(hash);
 
-		let exists = fs::metadata(&path).await.is_ok();
+		let exists = self.is_block_compressed(hash).await.is_ok();
 		let needed = self
 			.rc
 			.get(hash.as_ref())?
@@ -342,7 +409,7 @@ impl BlockManager {
 
 			let mut who = self.replication.write_nodes(&hash);
 			if who.len() < self.replication.write_quorum() {
-				return Err(Error::Message("Not trying to offload block because we don't have a quorum of nodes to write to".to_string()));
+				return Err(Error::Message(format!("Not trying to offload block because we don't have a quorum of nodes to write to")));
 			}
 			who.retain(|id| *id != self.system.id);
 
@@ -362,14 +429,14 @@ impl BlockManager {
 						}
 					}
 					_ => {
-						return Err(Error::Message(
+						return Err(Error::Message(format!(
-							"Unexpected response to NeedBlockQuery RPC".to_string(),
+							"Unexpected response to NeedBlockQuery RPC"
-						));
+						)));
 					}
 				}
 			}
 
-			if !need_nodes.is_empty() {
+			if need_nodes.len() > 0 {
 				trace!(
 					"Block {:?} needed by {} nodes, sending",
 					hash,
@@ -402,15 +469,14 @@ impl BlockManager {
 			// TODO find a way to not do this if they are sending it to us
 			// Let's suppose this isn't an issue for now with the BLOCK_RW_TIMEOUT delay
 			// between the RC being incremented and this part being called.
-			let block_data = self.rpc_get_block(&hash).await?;
+			let block = self.rpc_get_raw_block(&hash).await?;
-			self.write_block(hash, &block_data[..]).await?;
+			self.write_block(hash, &block).await?;
 		}
 
 		Ok(())
 	}
 
-	/// Ask nodes that might have a block for it
+	async fn rpc_get_raw_block(&self, hash: &Hash) -> Result<BlockData, Error> {
-	pub async fn rpc_get_block(&self, hash: &Hash) -> Result<Vec<u8>, Error> {
 		let who = self.replication.read_nodes(&hash);
 		let resps = self
 			.rpc_client
@@ -424,8 +490,9 @@ impl BlockManager {
 			.await?;
 
 		for resp in resps {
-			if let Message::PutBlock(msg) = resp {
+			match resp {
-				return Ok(msg.data);
+				Message::PutBlock { data, .. } => return Ok(data),
+				_ => {}
 			}
 		}
 		Err(Error::Message(format!(
@@ -434,13 +501,47 @@ impl BlockManager {
 		)))
 	}
 
+	/// Ask nodes that might have a block for it
+	pub async fn rpc_get_block(&self, hash: &Hash) -> Result<Vec<u8>, Error> {
+		self.rpc_get_raw_block(hash)
+			.await
+			.and_then(|data| match data {
+				BlockData::Plain(data) => Ok(data),
+				BlockData::Compressed(data) => {
+					zstd_decode(&data[..]).map_err(|_| Error::CorruptData(*hash))
+				}
+			})
+	}
+
 	/// Send block to nodes that should have it
 	pub async fn rpc_put_block(&self, hash: Hash, data: Vec<u8>) -> Result<(), Error> {
+		let garage = self.garage.load_full().unwrap();
+
+		let compressed = if garage.config.enable_compression {
+			zstd_encode(&data[..], garage.config.compression_level).ok()
+		} else {
+			None
+		};
+
+		// If compressed data is not less than 7/8 of the size of the original data, i.e. if we
+		// don't gain a significant margin by compressing, then we store the plain data instead
+		// so that we don't lose time decompressing it on reads.
+		let block_data =
+			if compressed.is_some() && compressed.as_ref().unwrap().len() < (data.len() * 7) / 8 {
+				BlockData::Compressed(compressed.unwrap())
+			} else {
+				BlockData::Plain(data)
+			};
+
+		let message = Message::PutBlock {
+			hash,
+			data: block_data,
+		};
 		let who = self.replication.write_nodes(&hash);
 		self.rpc_client
 			.try_call_many(
 				&who[..],
-				Message::PutBlock(PutBlockMessage { hash, data }),
+				message,
 				RequestStrategy::with_quorum(self.replication.write_quorum())
 					.with_timeout(BLOCK_RW_TIMEOUT),
 			)
@@ -478,7 +579,7 @@ impl BlockManager {
 
 	fn repair_aux_read_dir_rec<'a>(
 		&'a self,
-		path: &'a Path,
+		path: &'a PathBuf,
 		must_exit: &'a watch::Receiver<bool>,
 	) -> BoxFuture<'a, Result<(), Error>> {
 		// Lists all blocks on disk and adds them to the resync queue.
@@ -537,3 +638,16 @@ fn u64_from_be_bytes<T: AsRef<[u8]>>(bytes: T) -> u64 {
 	x8.copy_from_slice(bytes.as_ref());
 	u64::from_be_bytes(x8)
 }
+
+fn zstd_check_checksum<R: std::io::Read>(source: R) -> bool {
+	zstd::stream::copy_decode(source, std::io::sink()).is_ok()
+}
+
+fn zstd_encode<R: std::io::Read>(mut source: R, level: i32) -> std::io::Result<Vec<u8>> {
+	let mut result = Vec::<u8>::new();
+	let mut encoder = Encoder::new(&mut result, level)?;
+	encoder.include_checksum(true)?;
+	std::io::copy(&mut source, &mut encoder)?;
+	encoder.finish()?;
+	Ok(result)
+}

src/model/block_ref_table.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use garage_util::data::*;
 
-use garage_table::crdt::Crdt;
+use garage_table::crdt::CRDT;
 use garage_table::*;
 
 use crate::block::*;
@@ -14,18 +14,18 @@ pub struct BlockRef {
 	pub block: Hash,
 
 	/// Id of the Version for the object containing this block, used as sorting key
-	pub version: Uuid,
+	pub version: UUID,
 
 	// Keep track of deleted status
 	/// Is the Version that contains this block deleted
 	pub deleted: crdt::Bool,
 }
 
-impl Entry<Hash, Uuid> for BlockRef {
+impl Entry<Hash, UUID> for BlockRef {
 	fn partition_key(&self) -> &Hash {
 		&self.block
 	}
-	fn sort_key(&self) -> &Uuid {
+	fn sort_key(&self) -> &UUID {
 		&self.version
 	}
 	fn is_tombstone(&self) -> bool {
@@ -33,7 +33,7 @@ impl Entry<Hash, Uuid> for BlockRef {
 	}
 }
 
-impl Crdt for BlockRef {
+impl CRDT for BlockRef {
 	fn merge(&mut self, other: &Self) {
 		self.deleted.merge(&other.deleted);
 	}
@@ -45,12 +45,12 @@ pub struct BlockRefTable {
 
 impl TableSchema for BlockRefTable {
 	type P = Hash;
-	type S = Uuid;
+	type S = UUID;
 	type E = BlockRef;
 	type Filter = DeletedFilter;
 
 	fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) {
-		let block = &old.as_ref().or_else(|| new.as_ref()).unwrap().block;
+		let block = &old.as_ref().or(new.as_ref()).unwrap().block;
 		let was_before = old.as_ref().map(|x| !x.deleted.get()).unwrap_or(false);
 		let is_after = new.as_ref().map(|x| !x.deleted.get()).unwrap_or(false);
 		if is_after && !was_before {

src/model/bucket_table.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use garage_table::crdt::Crdt;
+use garage_table::crdt::CRDT;
 use garage_table::*;
 
 use crate::key_table::PermissionSet;
@@ -15,7 +15,7 @@ pub struct Bucket {
 	/// Name of the bucket
 	pub name: String,
 	/// State, and configuration if not deleted, of the bucket
-	pub state: crdt::Lww<BucketState>,
+	pub state: crdt::LWW<BucketState>,
 }
 
 /// State of a bucket
@@ -27,7 +27,7 @@ pub enum BucketState {
 	Present(BucketParams),
 }
 
-impl Crdt for BucketState {
+impl CRDT for BucketState {
 	fn merge(&mut self, o: &Self) {
 		match o {
 			BucketState::Deleted => *self = BucketState::Deleted,
@@ -44,31 +44,25 @@ impl Crdt for BucketState {
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct BucketParams {
 	/// Map of key with access to the bucket, and what kind of access they give
-	pub authorized_keys: crdt::LwwMap<String, PermissionSet>,
+	pub authorized_keys: crdt::LWWMap<String, PermissionSet>,
 	/// Is the bucket served as http
-	pub website: crdt::Lww<bool>,
+	pub website: crdt::LWW<bool>,
 }
 
-impl BucketParams {
+impl CRDT for BucketParams {
-	/// Create an empty BucketParams with no authorized keys and no website accesss
-	pub fn new() -> Self {
-		BucketParams {
-			authorized_keys: crdt::LwwMap::new(),
-			website: crdt::Lww::new(false),
-		}
-	}
-}
-
-impl Crdt for BucketParams {
 	fn merge(&mut self, o: &Self) {
 		self.authorized_keys.merge(&o.authorized_keys);
 		self.website.merge(&o.website);
 	}
 }
 
-impl Default for BucketParams {
+impl BucketParams {
-	fn default() -> Self {
+	/// Create an empty BucketParams with no authorized keys and no website accesss
-		Self::new()
+	pub fn new() -> Self {
+		BucketParams {
+			authorized_keys: crdt::LWWMap::new(),
+			website: crdt::LWW::new(false),
+		}
 	}
 }
 
@@ -77,7 +71,7 @@ impl Bucket {
 	pub fn new(name: String) -> Self {
 		Bucket {
 			name,
-			state: crdt::Lww::new(BucketState::Present(BucketParams::new())),
+			state: crdt::LWW::new(BucketState::Present(BucketParams::new())),
 		}
 	}
 
@@ -105,7 +99,7 @@ impl Entry<EmptyKey, String> for Bucket {
 	}
 }
 
-impl Crdt for Bucket {
+impl CRDT for Bucket {
 	fn merge(&mut self, other: &Self) {
 		self.state.merge(&other.state);
 	}

src/model/garage.rs

@@ -7,7 +7,6 @@ use garage_rpc::membership::System;
 use garage_rpc::rpc_client::RpcHttpClient;
 use garage_rpc::rpc_server::RpcServer;
 
-use garage_table::replication::ReplicationMode;
 use garage_table::replication::TableFullReplication;
 use garage_table::replication::TableShardedReplication;
 use garage_table::*;
@@ -51,9 +50,6 @@ impl Garage {
 		background: Arc<BackgroundRunner>,
 		rpc_server: &mut RpcServer,
 	) -> Arc<Self> {
-		let replication_mode = ReplicationMode::parse(&config.replication_mode)
-			.expect("Invalid replication_mode in config file.");
-
 		info!("Initialize membership management system...");
 		let rpc_http_client = Arc::new(
 			RpcHttpClient::new(config.max_concurrent_rpc_requests, &config.rpc_tls)
@@ -64,33 +60,32 @@ impl Garage {
 			rpc_http_client,
 			background.clone(),
 			rpc_server,
-			replication_mode.replication_factor(),
 		);
 
 		let data_rep_param = TableShardedReplication {
 			system: system.clone(),
-			replication_factor: replication_mode.replication_factor(),
+			replication_factor: config.data_replication_factor,
-			write_quorum: replication_mode.write_quorum(),
+			write_quorum: (config.data_replication_factor + 1) / 2,
 			read_quorum: 1,
 		};
 
 		let meta_rep_param = TableShardedReplication {
 			system: system.clone(),
-			replication_factor: replication_mode.replication_factor(),
+			replication_factor: config.meta_replication_factor,
-			write_quorum: replication_mode.write_quorum(),
+			write_quorum: (config.meta_replication_factor + 1) / 2,
-			read_quorum: replication_mode.read_quorum(),
+			read_quorum: (config.meta_replication_factor + 1) / 2,
 		};
 
 		let control_rep_param = TableFullReplication {
 			system: system.clone(),
-			max_faults: replication_mode.control_write_max_faults(),
+			max_faults: config.control_write_max_faults,
 		};
 
 		info!("Initialize block manager...");
 		let block_manager = BlockManager::new(
 			&db,
 			config.data_dir.clone(),
-			data_rep_param,
+			data_rep_param.clone(),
 			system.clone(),
 			rpc_server,
 		);
@@ -100,7 +95,7 @@ impl Garage {
 			BlockRefTable {
 				block_manager: block_manager.clone(),
 			},
-			meta_rep_param.clone(),
+			data_rep_param.clone(),
 			system.clone(),
 			&db,
 			"block_ref".to_string(),
@@ -126,7 +121,7 @@ impl Garage {
 				background: background.clone(),
 				version_table: version_table.clone(),
 			},
-			meta_rep_param,
+			meta_rep_param.clone(),
 			system.clone(),
 			&db,
 			"object".to_string(),
@@ -146,7 +141,7 @@ impl Garage {
 		info!("Initialize key_table_table...");
 		let key_table = Table::new(
 			KeyTable,
-			control_rep_param,
+			control_rep_param.clone(),
 			system.clone(),
 			&db,
 			"key".to_string(),
@@ -157,9 +152,9 @@ impl Garage {
 		let garage = Arc::new(Self {
 			config,
 			db,
-			background,
+			system: system.clone(),
-			system,
 			block_manager,
+			background,
 			bucket_table,
 			key_table,
 			object_table,

src/model/key_table.rs

@@ -13,14 +13,14 @@ pub struct Key {
 	pub secret_key: String,
 
 	/// Name for the key
-	pub name: crdt::Lww<String>,
+	pub name: crdt::LWW<String>,
 
 	/// Is the key deleted
 	pub deleted: crdt::Bool,
 
 	/// Buckets in which the key is authorized. Empty if `Key` is deleted
 	// CRDT interaction: deleted implies authorized_buckets is empty
-	pub authorized_buckets: crdt::LwwMap<String, PermissionSet>,
+	pub authorized_buckets: crdt::LWWMap<String, PermissionSet>,
 }
 
 impl Key {
@@ -31,9 +31,9 @@ impl Key {
 		Self {
 			key_id,
 			secret_key,
-			name: crdt::Lww::new(name),
+			name: crdt::LWW::new(name),
 			deleted: crdt::Bool::new(false),
-			authorized_buckets: crdt::LwwMap::new(),
+			authorized_buckets: crdt::LWWMap::new(),
 		}
 	}
 
@@ -42,9 +42,9 @@ impl Key {
 		Self {
 			key_id: key_id.to_string(),
 			secret_key: secret_key.to_string(),
-			name: crdt::Lww::new(name.to_string()),
+			name: crdt::LWW::new(name.to_string()),
 			deleted: crdt::Bool::new(false),
-			authorized_buckets: crdt::LwwMap::new(),
+			authorized_buckets: crdt::LWWMap::new(),
 		}
 	}
 
@@ -53,9 +53,9 @@ impl Key {
 		Self {
 			key_id,
 			secret_key: "".into(),
-			name: crdt::Lww::new("".to_string()),
+			name: crdt::LWW::new("".to_string()),
 			deleted: crdt::Bool::new(true),
-			authorized_buckets: crdt::LwwMap::new(),
+			authorized_buckets: crdt::LWWMap::new(),
 		}
 	}
 
@@ -85,7 +85,7 @@ pub struct PermissionSet {
 	pub allow_write: bool,
 }
 
-impl AutoCrdt for PermissionSet {
+impl AutoCRDT for PermissionSet {
 	const WARN_IF_DIFFERENT: bool = true;
 }
 
@@ -98,7 +98,7 @@ impl Entry<EmptyKey, String> for Key {
 	}
 }
 
-impl Crdt for Key {
+impl CRDT for Key {
 	fn merge(&mut self, other: &Self) {
 		self.name.merge(&other.name);
 		self.deleted.merge(&other.deleted);

src/model/object_table.rs

@@ -40,7 +40,6 @@ impl Object {
 	}
 
 	/// Adds a version if it wasn't already present
-	#[allow(clippy::result_unit_err)]
 	pub fn add_version(&mut self, new: ObjectVersion) -> Result<(), ()> {
 		match self
 			.versions
@@ -64,7 +63,7 @@ impl Object {
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct ObjectVersion {
 	/// Id of the version
-	pub uuid: Uuid,
+	pub uuid: UUID,
 	/// Timestamp of when the object was created
 	pub timestamp: u64,
 	/// State of the version
@@ -82,7 +81,7 @@ pub enum ObjectVersionState {
 	Aborted,
 }
 
-impl Crdt for ObjectVersionState {
+impl CRDT for ObjectVersionState {
 	fn merge(&mut self, other: &Self) {
 		use ObjectVersionState::*;
 		match other {
@@ -115,7 +114,7 @@ pub enum ObjectVersionData {
 	FirstBlock(ObjectVersionMeta, Hash),
 }
 
-impl AutoCrdt for ObjectVersionData {
+impl AutoCRDT for ObjectVersionData {
 	const WARN_IF_DIFFERENT: bool = true;
 }
 
@@ -140,18 +139,24 @@ pub struct ObjectVersionHeaders {
 }
 
 impl ObjectVersion {
-	fn cmp_key(&self) -> (u64, Uuid) {
+	fn cmp_key(&self) -> (u64, UUID) {
 		(self.timestamp, self.uuid)
 	}
 
 	/// Is the object version currently being uploaded
 	pub fn is_uploading(&self) -> bool {
-		matches!(self.state, ObjectVersionState::Uploading(_))
+		match self.state {
+			ObjectVersionState::Uploading(_) => true,
+			_ => false,
+		}
 	}
 
 	/// Is the object version completely received
 	pub fn is_complete(&self) -> bool {
-		matches!(self.state, ObjectVersionState::Complete(_))
+		match self.state {
+			ObjectVersionState::Complete(_) => true,
+			_ => false,
+		}
 	}
 
 	/// Is the object version available (received and not a tombstone)
@@ -178,7 +183,7 @@ impl Entry<String, String> for Object {
 	}
 }
 
-impl Crdt for Object {
+impl CRDT for Object {
 	fn merge(&mut self, other: &Self) {
 		// Merge versions from other into here
 		for other_v in other.versions.iter() {
@@ -202,7 +207,8 @@ impl Crdt for Object {
 			.iter()
 			.enumerate()
 			.rev()
-			.find(|(_, v)| v.is_complete())
+			.filter(|(_, v)| v.is_complete())
+			.next()
 			.map(|(vi, _)| vi);
 
 		if let Some(last_vi) = last_complete {

src/model/version_table.rs

@@ -14,7 +14,7 @@ use crate::block_ref_table::*;
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct Version {
 	/// UUID of the version, used as partition key
-	pub uuid: Uuid,
+	pub uuid: UUID,
 
 	// Actual data: the blocks for this version
 	// In the case of a multipart upload, also store the etags
@@ -35,7 +35,7 @@ pub struct Version {
 }
 
 impl Version {
-	pub fn new(uuid: Uuid, bucket: String, key: String, deleted: bool) -> Self {
+	pub fn new(uuid: UUID, bucket: String, key: String, deleted: bool) -> Self {
 		Self {
 			uuid,
 			deleted: deleted.into(),
@@ -78,7 +78,7 @@ pub struct VersionBlock {
 	pub size: u64,
 }
 
-impl AutoCrdt for VersionBlock {
+impl AutoCRDT for VersionBlock {
 	const WARN_IF_DIFFERENT: bool = true;
 }
 
@@ -94,7 +94,7 @@ impl Entry<Hash, EmptyKey> for Version {
 	}
 }
 
-impl Crdt for Version {
+impl CRDT for Version {
 	fn merge(&mut self, other: &Self) {
 		self.deleted.merge(&other.deleted);
 

src/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "0.3.0"
+version = "0.2.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,9 +13,7 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_util = { version = "0.3.0", path = "../util" }
+garage_util = { version = "0.2.1", path = "../util" }
-
-garage_rpc_021 = { package = "garage_rpc", version = "0.2.1" }
 
 arc-swap = "1.0"
 bytes = "1.0"

src/rpc/membership.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::fmt::Write as FmtWrite;
 use std::io::{Read, Write};
 use std::net::{IpAddr, SocketAddr};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
@@ -56,7 +56,7 @@ impl RpcMessage for Message {}
 /// A ping, containing informations about status and config
 #[derive(Debug, Serialize, Deserialize)]
 pub struct PingMessage {
-	id: Uuid,
+	id: UUID,
 	rpc_port: u16,
 
 	status_hash: Hash,
@@ -69,7 +69,7 @@ pub struct PingMessage {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct AdvertisedNode {
 	/// Id of the node this advertisement relates to
-	pub id: Uuid,
+	pub id: UUID,
 	/// IP and port of the node
 	pub addr: SocketAddr,
 
@@ -84,7 +84,7 @@ pub struct AdvertisedNode {
 /// This node's membership manager
 pub struct System {
 	/// The id of this node
-	pub id: Uuid,
+	pub id: UUID,
 
 	persist_config: Persister<NetworkConfig>,
 	persist_status: Persister<Vec<AdvertisedNode>>,
@@ -95,7 +95,6 @@ pub struct System {
 	rpc_http_client: Arc<RpcHttpClient>,
 	rpc_client: Arc<RpcClient<Message>>,
 
-	replication_factor: usize,
 	pub(crate) status: watch::Receiver<Arc<Status>>,
 	/// The ring
 	pub ring: watch::Receiver<Arc<Ring>>,
@@ -115,7 +114,7 @@ struct Updaters {
 #[derive(Debug, Clone)]
 pub struct Status {
 	/// Mapping of each node id to its known status
-	pub nodes: HashMap<Uuid, Arc<StatusEntry>>,
+	pub nodes: HashMap<UUID, Arc<StatusEntry>>,
 	/// Hash of `nodes`, used to detect when nodes have different views of the cluster
 	pub hash: Hash,
 }
@@ -199,15 +198,15 @@ impl Status {
 	}
 }
 
-fn gen_node_id(metadata_dir: &Path) -> Result<Uuid, Error> {
+fn gen_node_id(metadata_dir: &PathBuf) -> Result<UUID, Error> {
-	let mut id_file = metadata_dir.to_path_buf();
+	let mut id_file = metadata_dir.clone();
 	id_file.push("node_id");
 	if id_file.as_path().exists() {
 		let mut f = std::fs::File::open(id_file.as_path())?;
 		let mut d = vec![];
 		f.read_to_end(&mut d)?;
 		if d.len() != 32 {
-			return Err(Error::Message("Corrupt node_id file".to_string()));
+			return Err(Error::Message(format!("Corrupt node_id file")));
 		}
 
 		let mut id = [0u8; 32];
@@ -229,7 +228,6 @@ impl System {
 		rpc_http_client: Arc<RpcHttpClient>,
 		background: Arc<BackgroundRunner>,
 		rpc_server: &mut RpcServer,
-		replication_factor: usize,
 	) -> Arc<Self> {
 		let id = gen_node_id(&metadata_dir).expect("Unable to read or generate node ID");
 		info!("Node ID: {}", hex::encode(&id));
@@ -240,21 +238,11 @@ impl System {
 		let net_config = match persist_config.load() {
 			Ok(x) => x,
 			Err(e) => {
-				match Persister::<garage_rpc_021::ring::NetworkConfig>::new(
+				info!(
-					&metadata_dir,
+					"No valid previous network configuration stored ({}), starting fresh.",
-					"network_config",
+					e
-				)
+				);
-				.load()
+				NetworkConfig::new()
-				{
-					Ok(old_config) => NetworkConfig::migrate_from_021(old_config),
-					Err(e2) => {
-						info!(
-							"No valid previous network configuration stored ({}, {}), starting fresh.",
-							e, e2
-						);
-						NetworkConfig::new()
-					}
-				}
 			}
 		};
 
@@ -268,10 +256,10 @@ impl System {
 		let state_info = StateInfo {
 			hostname: gethostname::gethostname()
 				.into_string()
-				.unwrap_or_else(|_| "<invalid utf-8>".to_string()),
+				.unwrap_or("<invalid utf-8>".to_string()),
 		};
 
-		let ring = Ring::new(net_config, replication_factor);
+		let ring = Ring::new(net_config);
 		let (update_ring, ring) = watch::channel(Arc::new(ring));
 
 		let rpc_path = MEMBERSHIP_RPC_PATH.to_string();
@@ -289,7 +277,6 @@ impl System {
 			state_info,
 			rpc_http_client,
 			rpc_client,
-			replication_factor,
 			status,
 			ring,
 			update_lock: Mutex::new(Updaters {
@@ -309,12 +296,12 @@ impl System {
 				match msg {
 					Message::Ping(ping) => self2.handle_ping(&addr, &ping).await,
 
-					Message::PullStatus => Ok(self2.handle_pull_status()),
+					Message::PullStatus => self2.handle_pull_status(),
-					Message::PullConfig => Ok(self2.handle_pull_config()),
+					Message::PullConfig => self2.handle_pull_config(),
 					Message::AdvertiseNodesUp(adv) => self2.handle_advertise_nodes_up(&adv).await,
 					Message::AdvertiseConfig(adv) => self2.handle_advertise_config(&adv).await,
 
-					_ => Err(Error::BadRpc("Unexpected RPC message".to_string())),
+					_ => Err(Error::BadRPC(format!("Unexpected RPC message"))),
 				}
 			}
 		});
@@ -371,18 +358,18 @@ impl System {
 	) {
 		let self2 = self.clone();
 		self.background
-			.spawn_worker("discovery loop".to_string(), |stop_signal| {
+			.spawn_worker(format!("discovery loop"), |stop_signal| {
 				self2.discovery_loop(peers, consul_host, consul_service_name, stop_signal)
 			});
 
 		let self2 = self.clone();
 		self.background
-			.spawn_worker("ping loop".to_string(), |stop_signal| {
+			.spawn_worker(format!("ping loop"), |stop_signal| {
 				self2.ping_loop(stop_signal)
 			});
 	}
 
-	async fn ping_nodes(self: Arc<Self>, peers: Vec<(SocketAddr, Option<Uuid>)>) {
+	async fn ping_nodes(self: Arc<Self>, peers: Vec<(SocketAddr, Option<UUID>)>) {
 		let ping_msg = self.make_ping();
 		let ping_resps = join_all(peers.iter().map(|(addr, id_option)| {
 			let sys = self.clone();
@@ -437,6 +424,7 @@ impl System {
 						warn!("Node {:?} seems to be down.", id);
 						if !ring.config.members.contains_key(id) {
 							info!("Removing node {:?} from status (not in config and not responding to pings anymore)", id);
+							drop(st);
 							status.nodes.remove(&id);
 							has_changes = true;
 						}
@@ -450,7 +438,7 @@ impl System {
 		self.update_status(&update_locked, status).await;
 		drop(update_locked);
 
-		if !to_advertise.is_empty() {
+		if to_advertise.len() > 0 {
 			self.broadcast(Message::AdvertiseNodesUp(to_advertise), PING_TIMEOUT)
 				.await;
 		}
@@ -486,13 +474,15 @@ impl System {
 		Ok(self.make_ping())
 	}
 
-	fn handle_pull_status(&self) -> Message {
+	fn handle_pull_status(&self) -> Result<Message, Error> {
-		Message::AdvertiseNodesUp(self.status.borrow().to_serializable_membership(self))
+		Ok(Message::AdvertiseNodesUp(
+			self.status.borrow().to_serializable_membership(self),
+		))
 	}
 
-	fn handle_pull_config(&self) -> Message {
+	fn handle_pull_config(&self) -> Result<Message, Error> {
 		let ring = self.ring.borrow().clone();
-		Message::AdvertiseConfig(ring.config.clone())
+		Ok(Message::AdvertiseConfig(ring.config.clone()))
 	}
 
 	async fn handle_advertise_nodes_up(
@@ -540,7 +530,7 @@ impl System {
 		self.update_status(&update_lock, status).await;
 		drop(update_lock);
 
-		if !to_ping.is_empty() {
+		if to_ping.len() > 0 {
 			self.background
 				.spawn_cancellable(self.clone().ping_nodes(to_ping).map(Ok));
 		}
@@ -556,7 +546,7 @@ impl System {
 		let ring: Arc<Ring> = self.ring.borrow().clone();
 
 		if adv.version > ring.config.version {
-			let ring = Ring::new(adv.clone(), self.replication_factor);
+			let ring = Ring::new(adv.clone());
 			update_lock.update_ring.send(Arc::new(ring))?;
 			drop(update_lock);
 
@@ -586,8 +576,8 @@ impl System {
 			self.clone().ping_nodes(ping_addrs).await;
 
 			select! {
-				_ = restart_at.fuse() => {},
+				_ = restart_at.fuse() => (),
-				_ = stop_signal.changed().fuse() => {},
+				_ = stop_signal.changed().fuse() => (),
 			}
 		}
 	}
@@ -605,7 +595,7 @@ impl System {
 		};
 
 		while !*stop_signal.borrow() {
-			let not_configured = self.ring.borrow().config.members.is_empty();
+			let not_configured = self.ring.borrow().config.members.len() == 0;
 			let no_peers = self.status.borrow().nodes.len() < 3;
 			let bad_peers = self
 				.status
@@ -623,8 +613,11 @@ impl System {
 					.map(|ip| (*ip, None))
 					.collect::<Vec<_>>();
 
-				if let Ok(peers) = self.persist_status.load_async().await {
+				match self.persist_status.load_async().await {
-					ping_list.extend(peers.iter().map(|x| (x.addr, Some(x.id))));
+					Ok(peers) => {
+						ping_list.extend(peers.iter().map(|x| (x.addr, Some(x.id))));
+					}
+					_ => (),
 				}
 
 				if let Some((consul_host, consul_service_name)) = &consul_config {
@@ -643,17 +636,15 @@ impl System {
 
 			let restart_at = tokio::time::sleep(DISCOVERY_INTERVAL);
 			select! {
-				_ = restart_at.fuse() => {},
+				_ = restart_at.fuse() => (),
-				_ = stop_signal.changed().fuse() => {},
+				_ = stop_signal.changed().fuse() => (),
 			}
 		}
 	}
 
-	// for some reason fixing this is causing compilation error, see https://github.com/rust-lang/rust-clippy/issues/7052
-	#[allow(clippy::manual_async_fn)]
 	fn pull_status(
 		self: Arc<Self>,
-		peer: Uuid,
+		peer: UUID,
 	) -> impl futures::future::Future<Output = ()> + Send + 'static {
 		async move {
 			let resp = self
@@ -666,7 +657,7 @@ impl System {
 		}
 	}
 
-	async fn pull_config(self: Arc<Self>, peer: Uuid) {
+	async fn pull_config(self: Arc<Self>, peer: UUID) {
 		let resp = self
 			.rpc_client
 			.call(peer, Message::PullConfig, PING_TIMEOUT)
@@ -681,15 +672,18 @@ impl System {
 			let mut list = status.to_serializable_membership(&self);
 
 			// Combine with old peer list to make sure no peer is lost
-			if let Ok(old_list) = self.persist_status.load_async().await {
+			match self.persist_status.load_async().await {
-				for pp in old_list {
+				Ok(old_list) => {
-					if !list.iter().any(|np| pp.id == np.id) {
+					for pp in old_list {
-						list.push(pp);
+						if !list.iter().any(|np| pp.id == np.id) {
+							list.push(pp);
+						}
 					}
 				}
+				_ => (),
 			}
 
-			if !list.is_empty() {
+			if list.len() > 0 {
 				info!("Persisting new peer list ({} peers)", list.len());
 				self.persist_status
 					.save_async(&list)

src/rpc/ring.rs

@@ -7,9 +7,10 @@ use serde::{Deserialize, Serialize};
 
 use garage_util::data::*;
 
-/// A partition id, which is stored on 16 bits
+// A partition number is encoded on 16 bits,
-/// i.e. we have up to 2**16 partitions.
+// i.e. we have up to 2**16 partitions.
-/// (in practice we have exactly 2**PARTITION_BITS partitions)
+// (in practice we have exactly 2**PARTITION_BITS partitions)
+/// A partition id, stored on 16 bits
 pub type Partition = u16;
 
 // TODO: make this constant parametrizable in the config file
@@ -22,11 +23,16 @@ pub const PARTITION_BITS: usize = 8;
 
 const PARTITION_MASK_U16: u16 = ((1 << PARTITION_BITS) - 1) << (16 - PARTITION_BITS);
 
+// TODO: make this constant paraetrizable in the config file
+// (most deployments use a replication factor of 3, so...)
+/// The maximum number of time an object might get replicated
+pub const MAX_REPLICATION: usize = 3;
+
 /// The user-defined configuration of the cluster's nodes
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NetworkConfig {
 	/// Map of each node's id to it's configuration
-	pub members: HashMap<Uuid, NetworkConfigEntry>,
+	pub members: HashMap<UUID, NetworkConfigEntry>,
 	/// Version of this config
 	pub version: u64,
 }
@@ -38,31 +44,6 @@ impl NetworkConfig {
 			version: 0,
 		}
 	}
-
-	pub(crate) fn migrate_from_021(old: garage_rpc_021::ring::NetworkConfig) -> Self {
-		let members = old
-			.members
-			.into_iter()
-			.map(|(id, conf)| {
-				(
-					Hash::try_from(id.as_slice()).unwrap(),
-					NetworkConfigEntry {
-						zone: conf.datacenter,
-						capacity: if conf.capacity == 0 {
-							None
-						} else {
-							Some(conf.capacity)
-						},
-						tag: conf.tag,
-					},
-				)
-			})
-			.collect();
-		Self {
-			members,
-			version: old.version,
-		}
-	}
 }
 
 /// The overall configuration of one (possibly remote) node
@@ -70,80 +51,48 @@ impl NetworkConfig {
 pub struct NetworkConfigEntry {
 	/// Datacenter at which this entry belong. This infromation might be used to perform a better
 	/// geodistribution
-	pub zone: String,
+	pub datacenter: String,
 	/// The (relative) capacity of the node
-	/// If this is set to None, the node does not participate in storing data for the system
+	pub capacity: u32,
-	/// and is only active as an API gateway to other nodes
-	pub capacity: Option<u32>,
 	/// A tag to recognize the entry, not used for other things than display
 	pub tag: String,
 }
 
-impl NetworkConfigEntry {
-	pub fn capacity_string(&self) -> String {
-		match self.capacity {
-			Some(c) => format!("{}", c),
-			None => "gateway".to_string(),
-		}
-	}
-}
-
 /// A ring distributing fairly objects to nodes
 #[derive(Clone)]
 pub struct Ring {
-	/// The replication factor for this ring
-	pub replication_factor: usize,
-
 	/// The network configuration used to generate this ring
 	pub config: NetworkConfig,
-
+	/// The list of entries in the ring
-	// Internal order of nodes used to make a more compact representation of the ring
+	pub ring: Vec<RingEntry>,
-	nodes: Vec<Uuid>,
-
-	// The list of entries in the ring
-	ring: Vec<RingEntry>,
 }
 
-// Type to store compactly the id of a node in the system
-// Change this to u16 the day we want to have more than 256 nodes in a cluster
-type CompactNodeType = u8;
-
-// The maximum number of times an object might get replicated
-// This must be at least 3 because Garage supports 3-way replication
-// Here we use 6 so that the size of a ring entry is 8 bytes
-// (2 bytes partition id, 6 bytes node numbers as u8s)
-const MAX_REPLICATION: usize = 6;
-
 /// An entry in the ring
 #[derive(Clone, Debug)]
-struct RingEntry {
+pub struct RingEntry {
-	// The two first bytes of the first hash that goes in this partition
+	/// The prefix of the Hash of object which should use this entry
-	// (the next bytes are zeroes)
+	pub location: Hash,
-	hash_prefix: u16,
+	/// The nodes in which a matching object should get stored
-	// The nodes that store this partition, stored as a list of positions in the `nodes`
+	pub nodes: [UUID; MAX_REPLICATION],
-	// field of the Ring structure
-	// Only items 0 up to ring.replication_factor - 1 are used, others are zeros
-	nodes_buf: [CompactNodeType; MAX_REPLICATION],
 }
 
 impl Ring {
 	// TODO this function MUST be refactored, it's 100 lines long, with a 50 lines loop, going up to 6
 	// levels of imbrication. It is basically impossible to test, maintain, or understand for an
 	// outsider.
-	pub(crate) fn new(config: NetworkConfig, replication_factor: usize) -> Self {
+	pub(crate) fn new(config: NetworkConfig) -> Self {
 		// Create a vector of partition indices (0 to 2**PARTITION_BITS-1)
 		let partitions_idx = (0usize..(1usize << PARTITION_BITS)).collect::<Vec<_>>();
 
-		let zones = config
+		let datacenters = config
 			.members
 			.iter()
-			.filter(|(_id, info)| info.capacity.is_some())
+			.map(|(_id, info)| info.datacenter.as_str())
-			.map(|(_id, info)| info.zone.as_str())
 			.collect::<HashSet<&str>>();
-		let n_zones = zones.len();
+		let n_datacenters = datacenters.len();
 
 		// Prepare ring
-		let mut partitions: Vec<Vec<(&Uuid, &NetworkConfigEntry)>> = partitions_idx
+		let mut partitions: Vec<Vec<(&UUID, &NetworkConfigEntry)>> = partitions_idx
 			.iter()
 			.map(|_i| Vec::new())
 			.collect::<Vec<_>>();
@@ -152,7 +101,6 @@ impl Ring {
 		let mut queues = config
 			.members
 			.iter()
-			.filter(|(_id, info)| info.capacity.is_some())
 			.map(|(node_id, node_info)| {
 				let mut parts = partitions_idx
 					.iter()
@@ -171,13 +119,11 @@ impl Ring {
 		let max_capacity = config
 			.members
 			.iter()
-			.filter_map(|(_, node_info)| node_info.capacity)
+			.map(|(_, node_info)| node_info.capacity)
 			.fold(0, std::cmp::max);
 
-		assert!(replication_factor <= MAX_REPLICATION);
-
 		// Fill up ring
-		for rep in 0..replication_factor {
+		for rep in 0..MAX_REPLICATION {
 			queues.sort_by_key(|(ni, _np, _q, _p)| {
 				let queue_data = [&u16::to_be_bytes(rep as u16)[..], ni.as_slice()].concat();
 				fasthash(&queue_data[..])
@@ -192,19 +138,21 @@ impl Ring {
 				let remaining0 = remaining;
 				for i_round in 0..max_capacity {
 					for (node_id, node_info, q, pos) in queues.iter_mut() {
-						if i_round >= node_info.capacity.unwrap() {
+						if i_round >= node_info.capacity {
 							continue;
 						}
-						for (pos2, &qv) in q.iter().enumerate().skip(*pos) {
+						for pos2 in *pos..q.len() {
+							let qv = q[pos2];
 							if partitions[qv].len() != rep {
 								continue;
 							}
-							let p_zns = partitions[qv]
+							let p_dcs = partitions[qv]
 								.iter()
-								.map(|(_id, info)| info.zone.as_str())
+								.map(|(_id, info)| info.datacenter.as_str())
 								.collect::<HashSet<&str>>();
-							if (p_zns.len() < n_zones && !p_zns.contains(&node_info.zone.as_str()))
+							if (p_dcs.len() < n_datacenters
-								|| (p_zns.len() == n_zones
+								&& !p_dcs.contains(&node_info.datacenter.as_str()))
+								|| (p_dcs.len() == n_datacenters
 									&& !partitions[qv].iter().any(|(id, _i)| id == node_id))
 							{
 								partitions[qv].push((node_id, node_info));
@@ -219,58 +167,34 @@ impl Ring {
 					// No progress made, exit
 					warn!("Could not build ring, not enough nodes configured.");
 					return Self {
-						replication_factor,
 						config,
-						nodes: vec![],
 						ring: vec![],
 					};
 				}
 			}
 		}
 
-		// Make a canonical order for nodes
-		let nodes = config
-			.members
-			.iter()
-			.filter(|(_id, info)| info.capacity.is_some())
-			.map(|(id, _)| *id)
-			.collect::<Vec<_>>();
-		let nodes_rev = nodes
-			.iter()
-			.enumerate()
-			.map(|(i, id)| (*id, i as CompactNodeType))
-			.collect::<HashMap<Uuid, CompactNodeType>>();
-
 		let ring = partitions
 			.iter()
 			.enumerate()
 			.map(|(i, nodes)| {
 				let top = (i as u16) << (16 - PARTITION_BITS);
-				let nodes = nodes
+				let mut hash = [0u8; 32];
-					.iter()
+				hash[0..2].copy_from_slice(&u16::to_be_bytes(top)[..]);
-					.map(|(id, _info)| *nodes_rev.get(id).unwrap())
+				let nodes = nodes.iter().map(|(id, _info)| **id).collect::<Vec<UUID>>();
-					.collect::<Vec<CompactNodeType>>();
-				assert!(nodes.len() == replication_factor);
-				let mut nodes_buf = [0u8; MAX_REPLICATION];
-				nodes_buf[..replication_factor].copy_from_slice(&nodes[..]);
 				RingEntry {
-					hash_prefix: top,
+					location: hash.into(),
-					nodes_buf,
+					nodes: nodes.try_into().unwrap(),
 				}
 			})
 			.collect::<Vec<_>>();
 
-		Self {
+		Self { config, ring }
-			replication_factor,
-			config,
-			nodes,
-			ring,
-		}
 	}
 
 	/// Get the partition in which data would fall on
-	pub fn partition_of(&self, position: &Hash) -> Partition {
+	pub fn partition_of(&self, from: &Hash) -> Partition {
-		let top = u16::from_be_bytes(position.as_slice()[0..2].try_into().unwrap());
+		let top = u16::from_be_bytes(from.as_slice()[0..2].try_into().unwrap());
 		top >> (16 - PARTITION_BITS)
 	}
 
@@ -279,49 +203,37 @@ impl Ring {
 		let mut ret = vec![];
 
 		for (i, entry) in self.ring.iter().enumerate() {
-			let mut location = [0u8; 32];
+			ret.push((i as u16, entry.location));
-			location[..2].copy_from_slice(&u16::to_be_bytes(entry.hash_prefix)[..]);
-			ret.push((i as u16, location.into()));
 		}
-		if !ret.is_empty() {
+		if ret.len() > 0 {
 			assert_eq!(ret[0].1, [0u8; 32].into());
 		}
 
 		ret
 	}
 
+	// TODO rename this function as it no longer walk the ring
 	/// Walk the ring to find the n servers in which data should be replicated
-	pub fn get_nodes(&self, position: &Hash, n: usize) -> Vec<Uuid> {
+	pub fn walk_ring(&self, from: &Hash, n: usize) -> Vec<UUID> {
 		if self.ring.len() != 1 << PARTITION_BITS {
 			warn!("Ring not yet ready, read/writes will be lost!");
 			return vec![];
 		}
 
-		let partition_idx = self.partition_of(position) as usize;
+		let top = u16::from_be_bytes(from.as_slice()[0..2].try_into().unwrap());
+		let partition_idx = (top >> (16 - PARTITION_BITS)) as usize;
+		// TODO why computing two time in the same way and asserting?
+		assert_eq!(partition_idx, self.partition_of(from) as usize);
+
 		let partition = &self.ring[partition_idx];
 
-		let top = u16::from_be_bytes(position.as_slice()[0..2].try_into().unwrap());
+		let partition_top =
-		// Check that we haven't messed up our partition table, i.e. that this partition
+			u16::from_be_bytes(partition.location.as_slice()[0..2].try_into().unwrap());
-		// table entrey indeed corresponds to the item we are storing
+		// TODO is this an assertion on the validity of PARTITION_MASK_U16? If so, it should
-		assert_eq!(
+		// probably be a test more than a runtime assertion
-			partition.hash_prefix & PARTITION_MASK_U16,
+		assert_eq!(partition_top & PARTITION_MASK_U16, top & PARTITION_MASK_U16);
-			top & PARTITION_MASK_U16
-		);
 
-		assert!(n <= self.replication_factor);
+		assert!(n <= partition.nodes.len());
-		partition.nodes_buf[..n]
+		partition.nodes[..n].iter().cloned().collect::<Vec<_>>()
-			.iter()
-			.map(|i| self.nodes[*i as usize])
-			.collect::<Vec<_>>()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	#[test]
-	fn test_ring_entry_size() {
-		assert_eq!(std::mem::size_of::<RingEntry>(), 8);
 	}
 }

src/rpc/rpc_client.rs

@@ -19,7 +19,7 @@ use tokio::sync::{watch, Semaphore};
 use garage_util::background::BackgroundRunner;
 use garage_util::config::TlsConfig;
 use garage_util::data::*;
-use garage_util::error::{Error, RpcError};
+use garage_util::error::{Error, RPCError};
 
 use crate::membership::Status;
 use crate::rpc_server::RpcMessage;
@@ -70,7 +70,7 @@ pub struct RpcClient<M: RpcMessage> {
 	status: watch::Receiver<Arc<Status>>,
 	background: Arc<BackgroundRunner>,
 
-	local_handler: ArcSwapOption<(Uuid, LocalHandlerFn<M>)>,
+	local_handler: ArcSwapOption<(UUID, LocalHandlerFn<M>)>,
 
 	rpc_addr_client: RpcAddrClient<M>,
 }
@@ -91,7 +91,7 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 	}
 
 	/// Set the local handler, to process RPC to this node without network usage
-	pub fn set_local_handler<F, Fut>(&self, my_id: Uuid, handler: F)
+	pub fn set_local_handler<F, Fut>(&self, my_id: UUID, handler: F)
 	where
 		F: Fn(Arc<M>) -> Fut + Send + Sync + 'static,
 		Fut: Future<Output = Result<M, Error>> + Send + 'static,
@@ -110,12 +110,12 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 	}
 
 	/// Make a RPC call
-	pub async fn call(&self, to: Uuid, msg: M, timeout: Duration) -> Result<M, Error> {
+	pub async fn call(&self, to: UUID, msg: M, timeout: Duration) -> Result<M, Error> {
 		self.call_arc(to, Arc::new(msg), timeout).await
 	}
 
 	/// Make a RPC call from a message stored in an Arc
-	pub async fn call_arc(&self, to: Uuid, msg: Arc<M>, timeout: Duration) -> Result<M, Error> {
+	pub async fn call_arc(&self, to: UUID, msg: Arc<M>, timeout: Duration) -> Result<M, Error> {
 		if let Some(lh) = self.local_handler.load_full() {
 			let (my_id, local_handler) = lh.as_ref();
 			if to.borrow() == my_id {
@@ -128,7 +128,7 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 				if node_status.is_up() {
 					node_status
 				} else {
-					return Err(Error::from(RpcError::NodeDown(to)));
+					return Err(Error::from(RPCError::NodeDown(to)));
 				}
 			}
 			None => {
@@ -152,7 +152,7 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 	}
 
 	/// Make a RPC call to multiple servers, returning a Vec containing each result
-	pub async fn call_many(&self, to: &[Uuid], msg: M, timeout: Duration) -> Vec<Result<M, Error>> {
+	pub async fn call_many(&self, to: &[UUID], msg: M, timeout: Duration) -> Vec<Result<M, Error>> {
 		let msg = Arc::new(msg);
 		let mut resp_stream = to
 			.iter()
@@ -170,7 +170,7 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 	/// strategy could not be respected due to too many errors
 	pub async fn try_call_many(
 		self: &Arc<Self>,
-		to: &[Uuid],
+		to: &[UUID],
 		msg: M,
 		strategy: RequestStrategy,
 	) -> Result<Vec<M>, Error> {
@@ -222,7 +222,7 @@ impl<M: RpcMessage + 'static> RpcClient<M> {
 			Ok(results)
 		} else {
 			let errors = errors.iter().map(|e| format!("{}", e)).collect::<Vec<_>>();
-			Err(Error::from(RpcError::TooManyErrors(errors)))
+			Err(Error::from(RPCError::TooManyErrors(errors)))
 		}
 	}
 }
@@ -240,7 +240,7 @@ impl<M: RpcMessage> RpcAddrClient<M> {
 	pub fn new(http_client: Arc<RpcHttpClient>, path: String) -> Self {
 		Self {
 			phantom: PhantomData::default(),
-			http_client,
+			http_client: http_client,
 			path,
 		}
 	}
@@ -251,7 +251,7 @@ impl<M: RpcMessage> RpcAddrClient<M> {
 		to_addr: &SocketAddr,
 		msg: MB,
 		timeout: Duration,
-	) -> Result<Result<M, Error>, RpcError>
+	) -> Result<Result<M, Error>, RPCError>
 	where
 		MB: Borrow<M>,
 	{
@@ -268,8 +268,8 @@ pub struct RpcHttpClient {
 }
 
 enum ClientMethod {
-	Http(Client<HttpConnector, hyper::Body>),
+	HTTP(Client<HttpConnector, hyper::Body>),
-	Https(Client<tls_util::HttpsConnectorFixedDnsname<HttpConnector>, hyper::Body>),
+	HTTPS(Client<tls_util::HttpsConnectorFixedDnsname<HttpConnector>, hyper::Body>),
 }
 
 impl RpcHttpClient {
@@ -294,9 +294,9 @@ impl RpcHttpClient {
 			let connector =
 				tls_util::HttpsConnectorFixedDnsname::<HttpConnector>::new(config, "garage");
 
-			ClientMethod::Https(Client::builder().build(connector))
+			ClientMethod::HTTPS(Client::builder().build(connector))
 		} else {
-			ClientMethod::Http(Client::new())
+			ClientMethod::HTTP(Client::new())
 		};
 		Ok(RpcHttpClient {
 			method,
@@ -311,14 +311,14 @@ impl RpcHttpClient {
 		to_addr: &SocketAddr,
 		msg: MB,
 		timeout: Duration,
-	) -> Result<Result<M, Error>, RpcError>
+	) -> Result<Result<M, Error>, RPCError>
 	where
 		MB: Borrow<M>,
 		M: RpcMessage,
 	{
 		let uri = match self.method {
-			ClientMethod::Http(_) => format!("http://{}/{}", to_addr, path),
+			ClientMethod::HTTP(_) => format!("http://{}/{}", to_addr, path),
-			ClientMethod::Https(_) => format!("https://{}/{}", to_addr, path),
+			ClientMethod::HTTPS(_) => format!("https://{}/{}", to_addr, path),
 		};
 
 		let req = Request::builder()
@@ -327,8 +327,8 @@ impl RpcHttpClient {
 			.body(Body::from(rmp_to_vec_all_named(msg.borrow())?))?;
 
 		let resp_fut = match &self.method {
-			ClientMethod::Http(client) => client.request(req).fuse(),
+			ClientMethod::HTTP(client) => client.request(req).fuse(),
-			ClientMethod::Https(client) => client.request(req).fuse(),
+			ClientMethod::HTTPS(client) => client.request(req).fuse(),
 		};
 
 		trace!("({}) Acquiring request_limiter slot...", path);

src/rpc/rpc_server.rs

@@ -57,7 +57,7 @@ where
 	trace!(
 		"Request message: {}",
 		serde_json::to_string(&msg)
-			.unwrap_or_else(|_| "<json error>".into())
+			.unwrap_or("<json error>".into())
 			.chars()
 			.take(100)
 			.collect::<String>()
@@ -77,7 +77,7 @@ where
 			let rep_bytes = rmp_to_vec_all_named::<Result<M, String>>(&Err(err_str))?;
 			let mut err_response = Response::new(Body::from(rep_bytes));
 			*err_response.status_mut() = match e {
-				Error::BadRpc(_) => StatusCode::BAD_REQUEST,
+				Error::BadRPC(_) => StatusCode::BAD_REQUEST,
 				_ => StatusCode::INTERNAL_SERVER_ERROR,
 			};
 			warn!(
@@ -123,7 +123,7 @@ impl RpcServer {
 		req: Request<Body>,
 		addr: SocketAddr,
 	) -> Result<Response<Body>, Error> {
-		if req.method() != Method::POST {
+		if req.method() != &Method::POST {
 			let mut bad_request = Response::default();
 			*bad_request.status_mut() = StatusCode::BAD_REQUEST;
 			return Ok(bad_request);
@@ -201,7 +201,7 @@ impl RpcServer {
 					.get_ref()
 					.0
 					.peer_addr()
-					.unwrap_or_else(|_| ([0, 0, 0, 0], 0).into());
+					.unwrap_or(([0, 0, 0, 0], 0).into());
 				let self_arc = self_arc.clone();
 				async move {
 					Ok::<_, Error>(service_fn(move |req: Request<Body>| {

src/table/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "0.3.0"
+version = "0.2.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,8 +13,8 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_rpc = { version = "0.3.0", path = "../rpc" }
+garage_rpc = { version = "0.2.1", path = "../rpc" }
-garage_util = { version = "0.3.0", path = "../util" }
+garage_util = { version = "0.2.1", path = "../util" }
 
 bytes = "1.0"
 hexdump = "0.1"

src/table/crdt/bool.rs

@@ -27,7 +27,7 @@ impl From<bool> for Bool {
 	}
 }
 
-impl Crdt for Bool {
+impl CRDT for Bool {
 	fn merge(&mut self, other: &Self) {
 		self.0 = self.0 || other.0;
 	}

src/table/crdt/crdt.rs

@@ -18,7 +18,7 @@ use garage_util::data::*;
 /// Moreover, the relationship `≥` defined by `a ≥ b ⇔ ∃c. a = b ⊔ c` must be a partial order.
 /// This implies a few properties such as: if `a ⊔ b ≠ a`, then there is no `c` such that `(a ⊔ b) ⊔ c = a`,
 /// as this would imply a cycle in the partial order.
-pub trait Crdt {
+pub trait CRDT {
 	/// Merge the two datastructures according to the CRDT rules.
 	/// `self` is modified to contain the merged CRDT value. `other` is not modified.
 	///
@@ -31,16 +31,16 @@ pub trait Crdt {
 /// All types that implement `Ord` (a total order) can also implement a trivial CRDT
 /// defined by the merge rule: `a ⊔ b = max(a, b)`. Implement this trait for your type
 /// to enable this behavior.
-pub trait AutoCrdt: Ord + Clone + std::fmt::Debug {
+pub trait AutoCRDT: Ord + Clone + std::fmt::Debug {
 	/// WARN_IF_DIFFERENT: emit a warning when values differ. Set this to true if
 	/// different values in your application should never happen. Set this to false
 	/// if you are actually relying on the semantics of `a ⊔ b = max(a, b)`.
 	const WARN_IF_DIFFERENT: bool;
 }
 
-impl<T> Crdt for T
+impl<T> CRDT for T
 where
-	T: AutoCrdt,
+	T: AutoCRDT,
 {
 	fn merge(&mut self, other: &Self) {
 		if Self::WARN_IF_DIFFERENT && self != other {
@@ -52,20 +52,22 @@ where
 				*self = other.clone();
 			}
 			warn!("Making an arbitrary choice: {:?}", self);
-		} else if other > self {
+		} else {
-			*self = other.clone();
+			if other > self {
+				*self = other.clone();
+			}
 		}
 	}
 }
 
-impl AutoCrdt for String {
+impl AutoCRDT for String {
 	const WARN_IF_DIFFERENT: bool = true;
 }
 
-impl AutoCrdt for bool {
+impl AutoCRDT for bool {
 	const WARN_IF_DIFFERENT: bool = true;
 }
 
-impl AutoCrdt for FixedBytes32 {
+impl AutoCRDT for FixedBytes32 {
 	const WARN_IF_DIFFERENT: bool = true;
 }

src/table/crdt/lww.rs

@@ -36,14 +36,14 @@ use crate::crdt::crdt::*;
 /// This scheme is used by AWS S3 or Soundcloud and often without knowing
 /// in enterprise when reconciliating databases with ad-hoc scripts.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct Lww<T> {
+pub struct LWW<T> {
 	ts: u64,
 	v: T,
 }
 
-impl<T> Lww<T>
+impl<T> LWW<T>
 where
-	T: Crdt,
+	T: CRDT,
 {
 	/// Creates a new CRDT
 	///
@@ -99,9 +99,9 @@ where
 	}
 }
 
-impl<T> Crdt for Lww<T>
+impl<T> CRDT for LWW<T>
 where
-	T: Clone + Crdt,
+	T: Clone + CRDT,
 {
 	fn merge(&mut self, other: &Self) {
 		if other.ts > self.ts {

src/table/crdt/lww_map.rs

@@ -22,14 +22,14 @@ use crate::crdt::crdt::*;
 /// the serialization cost `O(n)` would still have to be paid at each modification, so we are
 /// actually not losing anything here.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct LwwMap<K, V> {
+pub struct LWWMap<K, V> {
 	vals: Vec<(K, u64, V)>,
 }
 
-impl<K, V> LwwMap<K, V>
+impl<K, V> LWWMap<K, V>
 where
 	K: Ord,
-	V: Crdt,
+	V: CRDT,
 {
 	/// Create a new empty map CRDT
 	pub fn new() -> Self {
@@ -94,7 +94,7 @@ where
 	/// put_my_crdt_value(a);
 	/// ```
 	pub fn take_and_clear(&mut self) -> Self {
-		let vals = std::mem::take(&mut self.vals);
+		let vals = std::mem::replace(&mut self.vals, vec![]);
 		Self { vals }
 	}
 	/// Removes all values from the map
@@ -113,22 +113,16 @@ where
 	pub fn items(&self) -> &[(K, u64, V)] {
 		&self.vals[..]
 	}
-
 	/// Returns the number of items in the map
 	pub fn len(&self) -> usize {
 		self.vals.len()
 	}
-
-	/// Returns true if the map is empty
-	pub fn is_empty(&self) -> bool {
-		self.len() == 0
-	}
 }
 
-impl<K, V> Crdt for LwwMap<K, V>
+impl<K, V> CRDT for LWWMap<K, V>
 where
 	K: Clone + Ord,
-	V: Clone + Crdt,
+	V: Clone + CRDT,
 {
 	fn merge(&mut self, other: &Self) {
 		for (k, ts2, v2) in other.vals.iter() {
@@ -149,13 +143,3 @@ where
 		}
 	}
 }
-
-impl<K, V> Default for LwwMap<K, V>
-where
-	K: Ord,
-	V: Crdt,
-{
-	fn default() -> Self {
-		Self::new()
-	}
-}

src/table/crdt/map.rs

@@ -22,7 +22,7 @@ pub struct Map<K, V> {
 impl<K, V> Map<K, V>
 where
 	K: Clone + Ord,
-	V: Clone + Crdt,
+	V: Clone + CRDT,
 {
 	/// Create a new empty map CRDT
 	pub fn new() -> Self {
@@ -62,17 +62,12 @@ where
 	pub fn len(&self) -> usize {
 		self.vals.len()
 	}
-
-	/// Returns true if the map is empty
-	pub fn is_empty(&self) -> bool {
-		self.len() == 0
-	}
 }
 
-impl<K, V> Crdt for Map<K, V>
+impl<K, V> CRDT for Map<K, V>
 where
 	K: Clone + Ord,
-	V: Clone + Crdt,
+	V: Clone + CRDT,
 {
 	fn merge(&mut self, other: &Self) {
 		for (k, v2) in other.vals.iter() {
@@ -87,13 +82,3 @@ where
 		}
 	}
 }
-
-impl<K, V> Default for Map<K, V>
-where
-	K: Clone + Ord,
-	V: Clone + Crdt,
-{
-	fn default() -> Self {
-		Self::new()
-	}
-}

src/table/crdt/mod.rs

@@ -10,7 +10,6 @@
 //! Learn more about CRDT [on Wikipedia](https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type)
 
 mod bool;
-#[allow(clippy::module_inception)]
 mod crdt;
 mod lww;
 mod lww_map;

src/table/data.rs

@@ -11,7 +11,7 @@ use garage_util::error::*;
 
 use garage_rpc::membership::System;
 
-use crate::crdt::Crdt;
+use crate::crdt::CRDT;
 use crate::replication::*;
 use crate::schema::*;
 
@@ -151,7 +151,7 @@ where
 
 			if Some(&new_entry) != old_entry.as_ref() {
 				let new_bytes = rmp_to_vec_all_named(&new_entry)
-					.map_err(Error::RmpEncode)
+					.map_err(Error::RMPEncode)
 					.map_err(sled::transaction::ConflictableTransactionError::Abort)?;
 				let new_bytes_hash = blake2sum(&new_bytes[..]);
 				mkl_todo.insert(tree_key.clone(), new_bytes_hash.as_slice())?;

src/table/gc.rs

@@ -24,23 +24,23 @@ use crate::schema::*;
 const TABLE_GC_BATCH_SIZE: usize = 1024;
 const TABLE_GC_RPC_TIMEOUT: Duration = Duration::from_secs(30);
 
-pub struct TableGc<F: TableSchema, R: TableReplication> {
+pub struct TableGC<F: TableSchema, R: TableReplication> {
 	system: Arc<System>,
 	data: Arc<TableData<F, R>>,
 
-	rpc_client: Arc<RpcClient<GcRpc>>,
+	rpc_client: Arc<RpcClient<GcRPC>>,
 }
 
 #[derive(Serialize, Deserialize)]
-enum GcRpc {
+enum GcRPC {
 	Update(Vec<ByteBuf>),
 	DeleteIfEqualHash(Vec<(ByteBuf, Hash)>),
 	Ok,
 }
 
-impl RpcMessage for GcRpc {}
+impl RpcMessage for GcRPC {}
 
-impl<F, R> TableGc<F, R>
+impl<F, R> TableGC<F, R>
 where
 	F: TableSchema + 'static,
 	R: TableReplication + 'static,
@@ -51,7 +51,7 @@ where
 		rpc_server: &mut RpcServer,
 	) -> Arc<Self> {
 		let rpc_path = format!("table_{}/gc", data.name);
-		let rpc_client = system.rpc_client::<GcRpc>(&rpc_path);
+		let rpc_client = system.rpc_client::<GcRPC>(&rpc_path);
 
 		let gc = Arc::new(Self {
 			system: system.clone(),
@@ -85,8 +85,8 @@ where
 				}
 			}
 			select! {
-				_ = tokio::time::sleep(Duration::from_secs(10)).fuse() => {},
+				_ = tokio::time::sleep(Duration::from_secs(10)).fuse() => (),
-				_ = must_exit.changed().fuse() => {},
+				_ = must_exit.changed().fuse() => (),
 			}
 		}
 	}
@@ -120,7 +120,7 @@ where
 			self.todo_remove_if_equal(&k[..], vhash)?;
 		}
 
-		if entries.is_empty() {
+		if entries.len() == 0 {
 			// Nothing to do in this iteration
 			return Ok(false);
 		}
@@ -168,7 +168,7 @@ where
 
 	async fn try_send_and_delete(
 		&self,
-		nodes: Vec<Uuid>,
+		nodes: Vec<UUID>,
 		items: Vec<(ByteBuf, Hash, ByteBuf)>,
 	) -> Result<(), Error> {
 		let n_items = items.len();
@@ -183,7 +183,7 @@ where
 		self.rpc_client
 			.try_call_many(
 				&nodes[..],
-				GcRpc::Update(updates),
+				GcRPC::Update(updates),
 				RequestStrategy::with_quorum(nodes.len()).with_timeout(TABLE_GC_RPC_TIMEOUT),
 			)
 			.await?;
@@ -196,7 +196,7 @@ where
 		self.rpc_client
 			.try_call_many(
 				&nodes[..],
-				GcRpc::DeleteIfEqualHash(deletes.clone()),
+				GcRPC::DeleteIfEqualHash(deletes.clone()),
 				RequestStrategy::with_quorum(nodes.len()).with_timeout(TABLE_GC_RPC_TIMEOUT),
 			)
 			.await?;
@@ -221,7 +221,7 @@ where
 
 	fn register_handler(self: &Arc<Self>, rpc_server: &mut RpcServer, path: String) {
 		let self2 = self.clone();
-		rpc_server.add_handler::<GcRpc, _, _>(path, move |msg, _addr| {
+		rpc_server.add_handler::<GcRPC, _, _>(path, move |msg, _addr| {
 			let self2 = self2.clone();
 			async move { self2.handle_rpc(&msg).await }
 		});
@@ -234,20 +234,20 @@ where
 			});
 	}
 
-	async fn handle_rpc(self: &Arc<Self>, message: &GcRpc) -> Result<GcRpc, Error> {
+	async fn handle_rpc(self: &Arc<Self>, message: &GcRPC) -> Result<GcRPC, Error> {
 		match message {
-			GcRpc::Update(items) => {
+			GcRPC::Update(items) => {
 				self.data.update_many(items)?;
-				Ok(GcRpc::Ok)
+				Ok(GcRPC::Ok)
 			}
-			GcRpc::DeleteIfEqualHash(items) => {
+			GcRPC::DeleteIfEqualHash(items) => {
 				for (key, vhash) in items.iter() {
 					self.data.delete_if_equal_hash(&key[..], *vhash)?;
 					self.todo_remove_if_equal(&key[..], *vhash)?;
 				}
-				Ok(GcRpc::Ok)
+				Ok(GcRPC::Ok)
 			}
-			_ => Err(Error::Message("Unexpected GC RPC".to_string())),
+			_ => Err(Error::Message(format!("Unexpected GC RPC"))),
 		}
 	}
 }