diff --git a/doc/talks/2024-02-03-fosdem/Makefile b/doc/talks/2024-02-03-fosdem/Makefile index 1440057c..f0aae6a8 100644 --- a/doc/talks/2024-02-03-fosdem/Makefile +++ b/doc/talks/2024-02-03-fosdem/Makefile @@ -1,23 +1,12 @@ -ASSETS=assets/consensus.pdf_tex \ - assets/lattice1.pdf_tex \ - assets/lattice2.pdf_tex \ - assets/lattice3.pdf_tex \ - assets/lattice4.pdf_tex \ - assets/lattice5.pdf_tex \ - assets/lattice6.pdf_tex \ - assets/lattice7.pdf_tex \ - assets/lattice8.pdf_tex \ - assets/latticeB_1.pdf_tex \ - assets/latticeB_2.pdf_tex \ - assets/latticeB_3.pdf_tex \ - assets/latticeB_4.pdf_tex \ - assets/latticeB_5.pdf_tex \ - assets/latticeB_6.pdf_tex \ - assets/latticeB_7.pdf_tex \ - assets/latticeB_8.pdf_tex \ - assets/latticeB_9.pdf_tex \ - assets/latticeB_10.pdf_tex \ - ../assets/deuxfleurs.pdf \ +ASSETS=../assets/lattice/lattice1.pdf_tex \ + ../assets/lattice/lattice2.pdf_tex \ + ../assets/lattice/lattice3.pdf_tex \ + ../assets/lattice/lattice4.pdf_tex \ + ../assets/lattice/lattice5.pdf_tex \ + ../assets/lattice/lattice6.pdf_tex \ + ../assets/lattice/lattice7.pdf_tex \ + ../assets/lattice/lattice8.pdf_tex \ + ../assets/logos/deuxfleurs.pdf \ ../assets/timeline-22-24.pdf talk.pdf: talk.tex $(ASSETS) diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme.png b/doc/talks/2024-02-03-fosdem/assets/aerogramme.png deleted file mode 100644 index 3aabe3ad..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme.svg b/doc/talks/2024-02-03-fosdem/assets/aerogramme.svg deleted file mode 100644 index 0c1ee127..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/aerogramme.svg +++ /dev/null @@ -1,1241 +0,0 @@ - - - - - - K2V APIS3 APIAerogramme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -IMAPIMAPIMAPMessageindexMessagebodies diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.drawio.pdf b/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.drawio.pdf deleted file mode 100644 index 71a90f26..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.drawio.pdf and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.png b/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.png deleted file mode 100644 index fb81b460..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components1.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.drawio.pdf b/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.drawio.pdf deleted file mode 100644 index 87e42eed..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.drawio.pdf and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.png b/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.png deleted file mode 100644 index f9e2df14..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_components2.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.drawio.pdf b/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.drawio.pdf deleted file mode 100644 index 0606e059..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.drawio.pdf and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.png b/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.png deleted file mode 100644 index c3b015a1..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_datatype.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.drawio.pdf b/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.drawio.pdf deleted file mode 100644 index 8fea81c7..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.drawio.pdf and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.png b/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.png deleted file mode 100644 index ed2077d9..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/aerogramme_keys.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/compatibility.png b/doc/talks/2024-02-03-fosdem/assets/compatibility.png deleted file mode 100644 index ce364a9b..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/compatibility.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/consensus.svg b/doc/talks/2024-02-03-fosdem/assets/consensus.svg deleted file mode 100644 index 8321e383..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/consensus.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - $\bot$ - - - - $x$ - - - $propose(x) / x$ - $propose(y) / x$ - - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_1.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_1.svg deleted file mode 100644 index 92232a1b..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_1.svg +++ /dev/null @@ -1,576 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $\not\sqsupseteq \{b\}$ - $\not\sqsupseteq \{b\}$ - $\not\sqsupseteq \{b\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_10.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_10.svg deleted file mode 100644 index 34c24e0d..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_10.svg +++ /dev/null @@ -1,715 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - return $\{a\}$ - - $\to \{\}$ - - $\to \{\}$ - $read()$: - ; - return $\{b\}$ - - $\to \{b\}$ - ${\Large\textbf{??!}}$~~~~~$\{a\} \not\sqsubseteq \{b\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_2.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_2.svg deleted file mode 100644 index c07cba2b..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_2.svg +++ /dev/null @@ -1,576 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $\not\sqsupseteq \{b\}$ - $\not\sqsupseteq \{b\}$ - $\not\sqsupseteq \{b\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_3.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_3.svg deleted file mode 100644 index 198d1f5d..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_3.svg +++ /dev/null @@ -1,576 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_4.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_4.svg deleted file mode 100644 index c5f6148d..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_4.svg +++ /dev/null @@ -1,587 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_5.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_5.svg deleted file mode 100644 index c2b668be..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_5.svg +++ /dev/null @@ -1,604 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_6.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_6.svg deleted file mode 100644 index 980823fc..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_6.svg +++ /dev/null @@ -1,632 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - return $\{a\}$ - - $\to \{\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_7.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_7.svg deleted file mode 100644 index 154c0b7d..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_7.svg +++ /dev/null @@ -1,654 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - return $\{a\}$ - - $\to \{\}$ - $read()$: - ; - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_8.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_8.svg deleted file mode 100644 index 21766415..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_8.svg +++ /dev/null @@ -1,671 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - return $\{a\}$ - - $\to \{\}$ - - $\to \{\}$ - $read()$: - ; - - diff --git a/doc/talks/2024-02-03-fosdem/assets/latticeB_9.svg b/doc/talks/2024-02-03-fosdem/assets/latticeB_9.svg deleted file mode 100644 index b60f8afe..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/latticeB_9.svg +++ /dev/null @@ -1,699 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $\{\}$ - $\{a,b,c\}$ - - $\{a\}$ - $\{b\}$ - $\{c\}$ - - - $\{a,c\}$ - $\{a,b\}$ - $\{b,c\}$ - - - - - - - - - - - - - - - - - - - $write(\{a\})$: - $\sqsupseteq \{a\} \to$ OK - $\not\sqsupseteq \{a\}$ - $\not\sqsupseteq \{a\}$ - - - - $write(\{b\})$: - $read()$: - $\not\sqsupseteq \{b\}$ - $\sqsupseteq \{b\} \to$ OK - $\not\sqsupseteq \{b\}$ - - - $\to \{a\}$ - return $\{a\}$ - - $\to \{\}$ - - $\to \{\}$ - $read()$: - ; - return $\{b\}$ - - $\to \{b\}$ - - diff --git a/doc/talks/2024-02-03-fosdem/assets/scr_garage_stats.png b/doc/talks/2024-02-03-fosdem/assets/scr_garage_stats.png deleted file mode 100644 index c92f0774..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/scr_garage_stats.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/scr_garage_status.png b/doc/talks/2024-02-03-fosdem/assets/scr_garage_status.png deleted file mode 100644 index 849b8336..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/scr_garage_status.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/scr_garage_status_broken.png b/doc/talks/2024-02-03-fosdem/assets/scr_garage_status_broken.png deleted file mode 100644 index 86dcce89..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/scr_garage_status_broken.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_get.png b/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_get.png deleted file mode 100644 index e7d4e288..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_get.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_list.png b/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_list.png deleted file mode 100644 index 472312a0..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/scr_garage_worker_list.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/slideB1.png b/doc/talks/2024-02-03-fosdem/assets/slideB1.png deleted file mode 100644 index b14b6070..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/slideB1.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/slideB2.png b/doc/talks/2024-02-03-fosdem/assets/slideB2.png deleted file mode 100644 index a881a796..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/slideB2.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/slideB3.png b/doc/talks/2024-02-03-fosdem/assets/slideB3.png deleted file mode 100644 index 830709d2..00000000 Binary files a/doc/talks/2024-02-03-fosdem/assets/slideB3.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/slides.svg b/doc/talks/2024-02-03-fosdem/assets/slides.svg deleted file mode 100644 index 9946c6fb..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/slides.svg +++ /dev/null @@ -1,4326 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - User-facing application - Database - Filesystem - - - - - - - - - - diff --git a/doc/talks/2024-02-03-fosdem/assets/slidesB.svg b/doc/talks/2024-02-03-fosdem/assets/slidesB.svg deleted file mode 100644 index c0a6e97c..00000000 --- a/doc/talks/2024-02-03-fosdem/assets/slidesB.svg +++ /dev/null @@ -1,444 +0,0 @@ - - - -User-facing applicationDatabase*K2VObject storage*(not really a database)Database diff --git a/doc/talks/2024-02-03-fosdem/talk.pdf b/doc/talks/2024-02-03-fosdem/talk.pdf index 03fa8fcc..7e6aa41a 100644 Binary files a/doc/talks/2024-02-03-fosdem/talk.pdf and b/doc/talks/2024-02-03-fosdem/talk.pdf differ diff --git a/doc/talks/2024-02-03-fosdem/talk.tex b/doc/talks/2024-02-03-fosdem/talk.tex index 4c4dcdbc..b7254dc2 100644 --- a/doc/talks/2024-02-03-fosdem/talk.tex +++ b/doc/talks/2024-02-03-fosdem/talk.tex @@ -10,6 +10,7 @@ \usepackage{graphicx} \usepackage{import} \usepackage{adjustbox} +\usepackage[absolute,overlay]{textpos} %\useoutertheme[footline=authortitle,subsection=false]{miniframes} %\useoutertheme[footline=authorinstitute,subsection=false]{miniframes} \useoutertheme{infolines} @@ -86,7 +87,7 @@ \begin{columns}[t] \begin{column}{.2\textwidth} \centering - \adjincludegraphics[width=.5\linewidth, valign=t]{../assets/deuxfleurs.pdf} + \adjincludegraphics[width=.5\linewidth, valign=t]{../assets/logos/deuxfleurs.pdf} \end{column} \begin{column}{.6\textwidth} \textbf{Deuxfleurs}\\ @@ -95,7 +96,7 @@ \end{column} \begin{column}{.2\textwidth} \centering - \adjincludegraphics[width=.7\linewidth, valign=t]{../assets/logo_chatons.png} + \adjincludegraphics[width=.7\linewidth, valign=t]{../assets/logos/logo_chatons.png} \end{column} \end{columns} @@ -116,39 +117,25 @@ \vspace{2em} \begin{center} \textbf{\underline{Resilience}}\\ - {\footnotesize (we want good uptime/availability with low supervision)} + {\footnotesize we want good uptime/availability with low supervision} \end{center} } \end{frame} \begin{frame} - \frametitle{How to make a \underline{stable} system} + \frametitle{Building a resilient system with cheap stuff} - Enterprise-grade systems typically employ: - \vspace{1em} - \begin{itemize} - \item RAID - \item Redundant power grid + UPS - \item Redundant Internet connections - \item Low-latency links - \item ... - \end{itemize} - \vspace{1em} - $\to$ it's costly and only worth it at DC scale -\end{frame} - -\begin{frame} - \frametitle{How to make a \underline{resilient} system} - - \only<1,4-5>{ - Instead, we use: - \vspace{1em} + \only<1,4-7>{ \begin{itemize} - \item \textcolor<2->{gray}{Commodity hardware (e.g. old desktop PCs)} + \item \textcolor<5->{gray}{Commodity hardware (e.g. old desktop PCs)\\ \vspace{.5em} - \item<4-> \textcolor<5->{gray}{Commodity Internet (e.g. FTTB, FTTH) and power grid} + \visible<4->{{\footnotesize (can die at any time)}}} + \vspace{1.5em} + \item<5-> \textcolor<7->{gray}{Regular Internet (e.g. FTTB, FTTH) and power grid connections\\ \vspace{.5em} - \item<5-> \textcolor<6->{gray}{\textbf{Geographical redundancy} (multi-site replication)} + \visible<6->{{\footnotesize (can be unavailable randomly)}}} + \vspace{1.5em} + \item<7-> \textbf{Geographical redundancy} (multi-site replication) \end{itemize} } \only<2>{ @@ -161,7 +148,7 @@ \includegraphics[width=.8\linewidth]{../assets/atuin.jpg} \end{center} } - \only<6>{ + \only<8>{ \begin{center} \includegraphics[width=.8\linewidth]{../assets/inframap_jdll2023.pdf} \end{center} @@ -171,22 +158,20 @@ \begin{frame} \frametitle{Object storage: a crucial component} \begin{center} - \includegraphics[height=6em]{../assets/Amazon-S3.jpg} + \includegraphics[height=6em]{../assets/logos/Amazon-S3.jpg} \hspace{3em} - \includegraphics[height=5em]{../assets/minio.png} + \visible<2->{\includegraphics[height=5em]{../assets/logos/minio.png}} \hspace{3em} - \includegraphics[height=6em]{../../logo/garage_hires_crop.png} + \visible<3>{\includegraphics[height=6em]{../../logo/garage_hires_crop.png}} \end{center} \vspace{1em} S3: a de-facto standard, many compatible applications \vspace{1em} - - MinIO is self-hostable but not suited for geo-distributed deployments + \visible<2->{MinIO is self-hostable but not suited for geo-distributed deployments} \vspace{1em} - - \textbf{Garage is a self-hosted drop-in replacement for the Amazon S3 object store} + \visible<3->{\textbf{Garage is a self-hosted drop-in replacement for the Amazon S3 object store}} \end{frame} \begin{frame} @@ -194,30 +179,30 @@ Consensus can be implemented reasonably well in practice, so why avoid it? \vspace{1em} \begin{itemize} - \item \textbf{Software complexity} + \item<2-> \textbf{Software complexity} \vspace{1em} - \item \textbf{Performance issues:} + \item<3-> \textbf{Performance issues:} \vspace{.5em} \begin{itemize} - \item The leader is a \textbf{bottleneck} for all requests\\ + \item<4-> The leader is a \textbf{bottleneck} for all requests\\ \vspace{.5em} - \item \textbf{Sensitive to higher latency} between nodes + \item<5-> \textbf{Sensitive to higher latency} between nodes \vspace{.5em} - \item \textbf{Takes time to reconverge} when disrupted (e.g. node going down) + \item<6-> \textbf{Takes time to reconverge} when disrupted (e.g. node going down) \end{itemize} \end{itemize} \vspace{2em} - $\to$ Garage uses only CRDTs internally (conflict-free replicated data types) + \visible<7->{\underline{Internally, Garage uses only CRDTs} (conflict-free replicated data types)} \end{frame} \begin{frame} \frametitle{The data model of object storage} - Object storage is basically a key-value store: - \vspace{1em} + Object storage is basically a \textbf{key-value store}: + \vspace{.5em} - {\footnotesize + {\scriptsize \begin{center} - \begin{tabular}{|l|p{8cm}|} + \begin{tabular}{|l|p{7cm}|} \hline \textbf{Key: file path + name} & \textbf{Value: file data + metadata} \\ \hline @@ -242,28 +227,33 @@ } \vspace{1em} - Simple interface, compatible with many existing applications - - \vspace{1em} - Maps well to CRDT data types + \begin{itemize} + \item<2> Maps well to CRDT data types + \end{itemize} \end{frame} \begin{frame} \frametitle{Performance gains in practice} \begin{center} - \includegraphics[width=.8\linewidth]{../assets/endpoint_latency_0.7_0.8_minio.png} + \includegraphics[width=.8\linewidth]{../assets/perf/endpoint_latency_0.7_0.8_minio.png} \end{center} \end{frame} + +% ======================================== TIMELINE +% ======================================== TIMELINE +% ======================================== TIMELINE + +\section{Recent developments} + +% ====================== v0.7.0 =============================== + \begin{frame} - \frametitle{Timeline} \begin{center} \includegraphics[width=.8\linewidth]{../assets/timeline-22-24.pdf} \end{center} \end{frame} -% ====================== v0.7.0 =============================== - \begin{frame} \frametitle{April 2022 - Garage v0.7.0} Focus on \underline{observability and ecosystem integration} @@ -271,8 +261,7 @@ \begin{itemize} \item \textbf{Monitoring:} metrics and traces, using OpenTelemetry \vspace{1em} - \item Alternative replication modes with 1 or 2 copies,\\ - modes with weaker consistency + \item Replication modes with 1 or 2 copies / weaker consistency \vspace{1em} \item Kubernetes integration \vspace{1em} @@ -285,19 +274,25 @@ \begin{frame} \frametitle{Metrics (Prometheus + Grafana)} \begin{center} - \includegraphics[width=.9\linewidth]{../assets/grafana_dashboard.png} + \includegraphics[width=.9\linewidth]{../assets/screenshots/grafana_dashboard.png} \end{center} \end{frame} \begin{frame} \frametitle{Traces (Jaeger)} \begin{center} - \includegraphics[width=.8\linewidth]{../assets/jaeger_listobjects.png} + \includegraphics[width=.8\linewidth]{../assets/screenshots/jaeger_listobjects.png} \end{center} \end{frame} % ====================== v0.8.0 =============================== +\begin{frame} + \begin{center} + \includegraphics[width=.8\linewidth]{../assets/timeline-22-24.pdf} + \end{center} +\end{frame} + \begin{frame} \frametitle{November 2022 - Garage v0.8.0} Focus on \underline{performance} @@ -315,8 +310,8 @@ \begin{frame} \frametitle{About metadata DB engines} - Issues with Sled: - \vspace{2em} + \textbf{Issues with Sled:} + \vspace{1em} \begin{itemize} \item Huge files on disk \vspace{.5em} @@ -326,8 +321,9 @@ \vspace{.5em} \item Not actively maintained \end{itemize} + \vspace{2em} - LMDB: very stable, good performance, reasonably small files on disk + \textbf{LMDB:} very stable, good performance, reasonably small files on disk \vspace{1em} Sled will be removed in Garage v1.0 @@ -336,7 +332,7 @@ \begin{frame} \frametitle{DB engine performance comparison} \begin{center} - \includegraphics[width=.6\linewidth]{../assets/db_engine.png} + \includegraphics[width=.6\linewidth]{../assets/perf/db_engine.png} \end{center} NB: Sqlite was slow due to synchronous journaling mode, now configurable \end{frame} @@ -352,19 +348,25 @@ \begin{frame} \frametitle{TTFB benchmark} \begin{center} - \includegraphics[width=.8\linewidth]{../assets/ttfb.png} + \includegraphics[width=.8\linewidth]{../assets/perf/ttfb.png} \end{center} \end{frame} \begin{frame} \frametitle{Throughput benchmark} \begin{center} - \includegraphics[width=.7\linewidth]{../assets/io-0.7-0.8-minio.png} + \includegraphics[width=.7\linewidth]{../assets/perf/io-0.7-0.8-minio.png} \end{center} \end{frame} % ====================== v0.9.0 =============================== +\begin{frame} + \begin{center} + \includegraphics[width=.8\linewidth]{../assets/timeline-22-24.pdf} + \end{center} +\end{frame} + \begin{frame} \frametitle{October 2023 - Garage v0.9.0} Focus on \underline{streamlining \& usability} @@ -389,90 +391,71 @@ \begin{frame} \frametitle{Layout computation} - \begin{center} - \includegraphics[width=\linewidth]{../assets/location-aware.png} - \end{center} - \vspace{2em} - Garage replicates data on different zones when possible -\end{frame} - -\begin{frame} - \frametitle{Layout computation} + \begin{overprint} + \onslide<1> \begin{center} - \includegraphics[width=.8\linewidth]{../assets/map.png} + \includegraphics[width=\linewidth, trim=0 0 0 -4cm]{../assets/screenshots/garage_status_0.9_prod_zonehl.png} \end{center} -\end{frame} - -\begin{frame} - \frametitle{Optimal layout computation} + \onslide<2> \begin{center} - \includegraphics[width=.6\linewidth]{../assets/geodistrib_paper.png} + \includegraphics[width=.7\linewidth]{../assets/map.png} \end{center} + \end{overprint} + \vspace{1em} + Garage stores replicas on different zones when possible \end{frame} \begin{frame} \frametitle{What a "layout" is} - \textbf{A layout is a precomputed index table} + \textbf{A layout is a precomputed index table:} + \vspace{1em} + + {\footnotesize + \begin{center} + \begin{tabular}{|l|l|l|l|} + \hline + \textbf{Partition} & \textbf{Node 1} & \textbf{Node 2} & \textbf{Node 3} \\ + \hline + \hline + Partition 0 & Io (jupiter) & Drosera (atuin) & Courgette (neptune) \\ + \hline + Partition 1 & Datura (atuin) & Courgette (neptune) & Io (jupiter) \\ + \hline + Partition 2 & Io(jupiter) & Celeri (neptune) & Drosera (atuin) \\ + \hline + \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ \\ + \hline + Partition 255 & Concombre (neptune) & Io (jupiter) & Drosera (atuin) \\ + \hline + \end{tabular} + \end{center} + } + \vspace{2em} - - \begin{center} - \begin{tabular}{|l|l|l|l|} - \hline - \textbf{Partition} & \textbf{Node 1} & \textbf{Node 2} & \textbf{Node 3} \\ - \hline - \hline - Partition 0 & Io (jupiter) & Drosera (atuin) & Courgette (neptune) \\ - \hline - Partition 1 & Datura (atuin) & Courgette (neptune) & Io (jupiter) \\ - \hline - Partition 2 & Io(jupiter) & Celeri (neptune) & Drosera (atuin) \\ - \hline - \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ & \hspace{1em}$\vdots$ \\ - \hline - Partition 255 & Concombre (neptune) & Io (jupiter) & Drosera (atuin) \\ - \hline - \end{tabular} - \end{center} - - \vspace{1em} + \visible<2->{ The index table is built centrally using an optimal algorithm,\\ then propagated to all nodes + } \end{frame} \begin{frame} - \frametitle{The relationship between \emph{partition} and \emph{partition key}} - \begin{center} - \begin{tabular}{|l|l|l|l|} - \hline - \textbf{Partition key} & \textbf{Partition} & \textbf{Sort key} & \textbf{Value} \\ - \hline - \hline - \texttt{website} & Partition 12 & \texttt{index.html} & (file data) \\ - \hline - \texttt{website} & Partition 12 & \texttt{img/logo.svg} & (file data) \\ - \hline - \texttt{website} & Partition 12 &\texttt{download/index.html} & (file data) \\ - \hline - \hline - \texttt{backup} & Partition 42 & \texttt{borg/index.2822} & (file data) \\ - \hline - \texttt{backup} & Partition 42 & \texttt{borg/data/2/2329} & (file data) \\ - \hline - \texttt{backup} & Partition 42 & \texttt{borg/data/2/2680} & (file data) \\ - \hline - \hline - \texttt{private} & Partition 42 & \texttt{qq3a2nbe1qjq0ebbvo6ocsp6co} & (file data) \\ - \hline - \end{tabular} - \end{center} - \vspace{1em} - \textbf{To read or write an item:} hash partition key - \\ \hspace{5cm} $\to$ determine partition number (first 8 bits) - \\ \hspace{5cm} $\to$ find associated nodes + \frametitle{Optimal layout computation} + \begin{figure} + \center + \includegraphics[width=.6\linewidth]{../assets/geodistrib_paper.png} + \end{figure} \end{frame} + + % ====================== v0.10.0 =============================== +\begin{frame} + \begin{center} + \includegraphics[width=.8\linewidth]{../assets/timeline-22-24.pdf} + \end{center} +\end{frame} + \begin{frame} \frametitle{October 2023 - Garage v0.10.0 beta} Focus on \underline{consistency} @@ -482,368 +465,74 @@ \end{itemize} \end{frame} - - - -% -------------------------------------------------------------------- -% ================================================================================= -% ================================================================================= -% -------------------------------------------------------------------- -% -------------------------------------------------------------------- -% -------------------------------------------------------------------- -% ================================================================================= -% ================================================================================= -% -------------------------------------------------------------------- - - - - \begin{frame} - \frametitle{Two big problems} - \begin{enumerate} - \item \textbf{How to place data on different nodes?}\\ + \frametitle{Working with weak consistency} + Not using consensus limits us to the following: + \vspace{2em} + \begin{itemize} + \item<2-> \textbf{Conflict-free replicated data types} (CRDT)\\ \vspace{1em} - \underline{Constraints:} heterogeneous hardware\\ - \underline{Objective:} $n$ copies of everything, maximize usable capacity, maximize resilience\\ + {\footnotesize Non-transactional key-value stores such as S3 are equivalent to a simple CRDT:\\ + a map of \textbf{last-writer-wins registers} (each key is its own CRDT)} + \vspace{1.5em} + \item<3-> \textbf{Read-after-write consistency}\\ \vspace{1em} - $\to$ the Dynamo model + optimization algorithms - \vspace{2em} - \item<2-> \textbf{How to guarantee consistency?}\\ - \vspace{1em} - \underline{Constraints:} slow network (geographical distance), node unavailability/crashes\\ - \underline{Objective:} maximize availability, read-after-write guarantee\\ - \vspace{1em} - $\to$ CRDTs, monotonicity, read and write quorums - \end{enumerate} + {\footnotesize Can be implemented using quorums on read and write operations} + \end{itemize} \end{frame} -\section{Problem 1: placing data} - -\begin{frame} - \frametitle{Key-value stores, upgraded: the Dynamo model} - \textbf{Two keys:} - \begin{itemize} - \item Partition key: used to divide data into partitions {\small (a.k.a.~shards)} - \item Sort key: used to identify items inside a partition - \end{itemize} +\begin{frame}[t] + \frametitle{CRDT read-after-write consistency using quorums} \vspace{1em} - - \begin{center} - \begin{tabular}{|l|l|p{3cm}|} - \hline - \textbf{Partition key: bucket} & \textbf{Sort key: filename} & \textbf{Value} \\ - \hline - \hline - \texttt{website} & \texttt{index.html} & (file data) \\ - \hline - \texttt{website} & \texttt{img/logo.svg} & (file data) \\ - \hline - \texttt{website} & \texttt{download/index.html} & (file data) \\ - \hline - \hline - \texttt{backup} & \texttt{borg/index.2822} & (file data) \\ - \hline - \texttt{backup} & \texttt{borg/data/2/2329} & (file data) \\ - \hline - \texttt{backup} & \texttt{borg/data/2/2680} & (file data) \\ - \hline - \hline - \texttt{private} & \texttt{qq3a2nbe1qjq0ebbvo6ocsp6co} & (file data) \\ - \hline - \end{tabular} - \end{center} -\end{frame} - -\begin{frame} - \frametitle{Key-value stores, upgraded: the Dynamo model} - \begin{itemize} - \item Data with different partition keys is stored independently,\\ - on a different set of nodes\\ - \vspace{.5em} - $\to$ no easy way to list all partition keys\\ - $\to$ no cross-shard transactions\\ - \vspace{2em} - \item Placing data: hash the partition key, select nodes accordingly\\ - \vspace{.5em} - $\to$ distributed hash table (DHT) - \vspace{2em} - \item For a given value of the partition key, items can be listed using their sort keys - \end{itemize} -\end{frame} - - -\begin{frame} - \frametitle{Issues with consistent hashing} - \begin{itemize} - \item Consistent hashing doesn't dispatch data based on geographical location of nodes - \vspace{1em} - \item<2-> Geographically aware adaptation, try 1:\\ - data quantities not well balanced between nodes - \vspace{1em} - \item<3-> Geographically aware adaptation, try 2:\\ - too many reshuffles when adding/removing nodes - \end{itemize} -\end{frame} - - -\section{Problem 2: ensuring consistency} - -\begin{frame} - \frametitle{Consensus vs weak consistency} - - \hspace{1em} - \begin{minipage}{7cm} - \textbf{Consensus-based systems:} - \vspace{1em} - \begin{itemize} - \item \textbf{Leader-based:} a leader is elected to coordinate - all reads and writes - \vspace{1em} - \item \textbf{Linearizability} of all operations\\ - (strongest consistency guarantee) - \vspace{1em} - \item Any sequential specification can be implemented as a \textbf{replicated state machine} - \vspace{1em} - \item \textbf{Costly}, the leader is a bottleneck; - leader elections on failure take time - \end{itemize} - \end{minipage} - \hfill - \begin{minipage}{7cm} \visible<2->{ - \textbf{Weakly consistent systems:} - \vspace{1em} - \begin{itemize} - \item \textbf{Nodes are equivalent}, any node - can originate a read or write operation - \vspace{1em} - \item \textbf{Read-after-write consistency} with quorums, - eventual consistency without - \vspace{1em} - \item \textbf{Operations have to commute}, i.e.~we - can only implement CRDTs - \vspace{1em} - \item \textbf{Fast}, no single bottleneck;\\ - works the same with offline nodes - \end{itemize} - } \end{minipage} - \hspace{1em} -\end{frame} - -\begin{frame} - \frametitle{Consensus vs weak consistency} - \begin{center} - \textbf{From a theoretical point of view:}\\ - - \end{center} - \vspace{2em} - - \hspace{1em} - \begin{minipage}{6.5cm} - \underline{Consensus-based systems:} - - \vspace{1em} - - Require \textbf{additional assumptions} such as a fault detector or a strong RNG\\ - (FLP impossibility theorem) - \end{minipage} - \hfill - \begin{minipage}{6.5cm} - \underline{Weakly consistent systems:} - - \vspace{1em} - - Can be implemented in \textbf{any\\asynchronous message passing\\distributed system} with node crashes - \end{minipage} - \hspace{1em} - - \vspace{3em} - \begin{center} - They represent \textbf{different classes of computational capability}\\ - \end{center} -\end{frame} - -\begin{frame} - \frametitle{Consensus vs weak consistency} - \begin{center} - \textbf{The same objects cannot be implemented in both models.} - \end{center} - \vspace{2em} - - \hspace{1em} - \begin{minipage}{6.5cm} - \underline{Consensus-based systems:} - - \vspace{1em} - - \textbf{Any sequential specification}\\~ - - \vspace{1em} - \textbf{Easier to program for}: just write your program as if it were sequential on a single machine - - \end{minipage} - \hfill - \begin{minipage}{6.5cm} - \underline{Weakly consistent systems:} - - \vspace{1em} - - \textbf{Only CRDTs}\\(conflict-free replicated data types) - - \vspace{1em} - Part of the complexity is \textbf{reported to the consumer of the API}\\~ - \end{minipage} - \hspace{1em} -\end{frame} - -\begin{frame} - \frametitle{Understanding the power of consensus} - \textbf{Consensus:} an API with a single operation, $propose(x)$ - \begin{enumerate} - \item nodes all call $propose(x)$ with their proposed value; - \item nodes all receive the same value as a return value, which is one of the proposed values - \end{enumerate} - \vspace{1em} - - \visible<2->{ - \textbf{Equivalent to} a distributed algorithm that gives a total order on all requests + {\small + \textbf{Property:} If node $A$ did an operation $write(x)$ and received an OK response,\\ + \hspace{2cm} and node $B$ starts an operation $read()$ after $A$ received OK,\\ + \hspace{2cm} then $B$ will read a value $x' \sqsupseteq x$. } - \vspace{1em} - \visible<3->{ - \textbf{Implemented by} this simple replicated state machine: - \vspace{.5em} + \vspace{1.5em} + \begin{overprint} + \onslide<2-9> \begin{figure} \centering - \def\svgwidth{.5\textwidth} - \large - \import{assets/}{consensus.pdf_tex} + \footnotesize + \def\svgwidth{.7\textwidth} + \only<2>{\import{../assets/lattice/}{lattice1.pdf_tex}}% + \only<3>{\import{../assets/lattice/}{lattice2.pdf_tex}}% + \only<4>{\import{../assets/lattice/}{lattice3.pdf_tex}}% + \only<5>{\import{../assets/lattice/}{lattice4.pdf_tex}}% + \only<6>{\import{../assets/lattice/}{lattice5.pdf_tex}}% + \only<7>{\import{../assets/lattice/}{lattice6.pdf_tex}}% + \only<8>{\import{../assets/lattice/}{lattice7.pdf_tex}}% + \only<9>{\import{../assets/lattice/}{lattice8.pdf_tex}}% \end{figure} - \vspace{1em} - } -\end{frame} - -\begin{frame} - \frametitle{Can my object be implemented without consensus?} - \underline{Given the specification of an API:} - \vspace{2em} - \begin{itemize} - \item \textbf{Using this API, we can implement the consensus object} (the $propose$ function)\\ - $\to$ the API is equivalent to consensus/total ordering of messages\\ - $\to$ the API cannot be implemented in a weakly consistent system - \vspace{2em} - \item<2-> \textbf{This API can be implemented using only weak primitives}\\ - (e.g. in the asynchronous message passing model with no further assumption)\\ - $\to$ the API is strictly weaker than consensus\\ - $\to$ we can implement it in Garage! - \end{itemize} -\end{frame} - - -\begin{frame} - \frametitle{What can we implement without consensus?} - \begin{itemize} - \item Any \textbf{conflict-free replicated data type} (CRDT) + + \onslide<10> + \begin{minipage}{.10\textwidth} + ~ + \end{minipage} + \begin{minipage}{.40\textwidth} + \footnotesize + \textbf{Algorithm $write(x)$:} + \begin{enumerate} + \item Broadcast $write(x)$ to all nodes + \item Wait for $k > n/2$ nodes to reply OK + \item Return OK + \end{enumerate} + \end{minipage} + \begin{minipage}{.40\textwidth} + \footnotesize \vspace{1em} - \item<2-> Non-transactional key-value stores such as S3 are equivalent to a simple CRDT:\\ - a map of \textbf{last-writer-wins registers} (each key is its own CRDT) - \vspace{1em} - \item<3-> \textbf{Read-after-write consistency} can be implemented - using quorums on read and write operations - \vspace{1em} - \item<4-> \textbf{Monotonicity of reads} can be implemented with repair-on-read\\ - (makes reads more costly, not implemented in Garage) - \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{CRDTs and quorums: read-after-write consistency} - \begin{figure} - \centering - \def\svgwidth{.8\textwidth} - \only<1>{\import{assets/}{lattice1.pdf_tex}}% - \only<2>{\import{assets/}{lattice2.pdf_tex}}% - \only<3>{\import{assets/}{lattice3.pdf_tex}}% - \only<4>{\import{assets/}{lattice4.pdf_tex}}% - \only<5>{\import{assets/}{lattice5.pdf_tex}}% - \only<6>{\import{assets/}{lattice6.pdf_tex}}% - \only<7>{\import{assets/}{lattice7.pdf_tex}}% - \only<8>{\import{assets/}{lattice8.pdf_tex}}% - \end{figure} -\end{frame} - -\begin{frame} - \frametitle{CRDTs and quorums: read-after-write consistency} - \textbf{Property:} If node $A$ did an operation $write(x)$ and received an OK response,\\ - \hspace{2cm} and node $B$ starts an operation $read()$ after $A$ received OK,\\ - \hspace{2cm} then $B$ will read a value $x' \sqsupseteq x$. - - \vspace{1em} - - \hspace{1em} - \begin{minipage}{6.8cm} - \textbf{Algorithm $write(x)$:} - \begin{enumerate} - \item Broadcast $write(x)$ to all nodes - \item Wait for $k > n/2$ nodes to reply OK - \item Return OK - \end{enumerate} - \end{minipage} - \hfill - \begin{minipage}{6.8cm} - \vspace{1em} - \textbf{Algorithm $read()$:} - \begin{enumerate} - \item Broadcast $read()$ to all nodes - \item Wait for $k > n/2$ nodes to reply\\ - with values $x_1, \dots, x_k$ - \item Return $x_1 \sqcup \dots \sqcup x_k$ - \end{enumerate} - \end{minipage} - \hspace{1em} - - \vspace{2em} - \textbf{Why does it work?} There is at least one node at the intersection between the two sets of nodes that replied to each request, that ``saw'' $x$ before the $read()$ started ($x_i \sqsupseteq x$). -\end{frame} - -\begin{frame} - \frametitle{CRDTs and quorums: monotonic-reads consistency} - \begin{figure} - \centering - \def\svgwidth{.8\textwidth} - \only<1>{\import{assets/}{latticeB_1.pdf_tex}}% - \only<2>{\import{assets/}{latticeB_2.pdf_tex}}% - \only<3>{\import{assets/}{latticeB_3.pdf_tex}}% - \only<4>{\import{assets/}{latticeB_4.pdf_tex}}% - \only<5>{\import{assets/}{latticeB_5.pdf_tex}}% - \only<6>{\import{assets/}{latticeB_6.pdf_tex}}% - \only<7>{\import{assets/}{latticeB_7.pdf_tex}}% - \only<8>{\import{assets/}{latticeB_8.pdf_tex}}% - \only<9>{\import{assets/}{latticeB_9.pdf_tex}}% - \only<10>{\import{assets/}{latticeB_10.pdf_tex}}% - \end{figure} -\end{frame} - -\begin{frame} - \frametitle{CRDTs and quorums: monotonic-reads consistency} - \textbf{Property:} If node $A$ did an operation $read()$ and received $x$ as a response,\\ - \hspace{2cm} and node $B$ starts an operation $read()$ after $A$ received $x$,\\ - \hspace{2cm} then $B$ will read a value $x' \sqsupseteq x$. - - \vspace{1em} - - \textbf{Algorithm $monotonic\_read()$:} {\small (a.k.a. repair-on-read)} - \begin{enumerate} - \item Broadcast $read()$ to all nodes - \item Wait for $k > n/2$ nodes to reply with values $x_1, \dots, x_k$ - \item If $x_i \ne x_j$ for some nodes $i$ and $j$,\\ - \hspace{1cm}then call $write(x_1 \sqcup \dots \sqcup x_k)$ and wait for OK from $k' > n/2$ nodes - \item Return $x_1 \sqcup \dots \sqcup x_k$ - \end{enumerate} - - \vspace{1em} - - This makes reads slower in some cases, and is \textbf{not implemented in Garage}. + \textbf{Algorithm $read()$:} + \begin{enumerate} + \item Broadcast $read()$ to all nodes + \item Wait for $k > n/2$ nodes to reply\\ + with values $x_1, \dots, x_k$ + \item Return $x_1 \sqcup \dots \sqcup x_k$ + \end{enumerate} + \end{minipage} + \end{overprint} \end{frame} \begin{frame} @@ -852,26 +541,84 @@ \item We rely on quorums $k > n/2$ within each partition:\\ $$n=3,~~~~~~~k\ge 2$$ \item<2-> When rebalancing, the set of nodes responsible for a partition can change:\\ - $$\{n_A, n_B, n_C\} \to \{n_A, n_D, n_E\}$$ + $$\{A, B, C\} \to \{A, D, E\}$$ \vspace{.01em} \item<3-> During the rebalancing, $D$ and $E$ don't yet have the data,\\ ~~~~~~~~~~~~~~~~~~~and $B$ and $C$ want to get rid of the data to free up space\\ - \vspace{.2em} - $\to$ quorums only within the new set of nodes don't work\\ - $\to$ how to coordinate? \textbf{currently, we don't...} - + \vspace{1.2em} + $\to$ risk of inconsistency, \textbf{how to coordinate?} \end{itemize} \end{frame} +\begin{frame} + \frametitle{Handling layout changes without losing consistency} + \begin{minipage}{.55\textwidth} + \begin{itemize} + \item \textbf{Solution:}\\ + \vspace{.5em} + \begin{itemize} + \item keep track of data transfer to new nodes + \vspace{.5em} + \item use multiple write quorums\\ + (new nodes + old nodes\\ + while data transfer is in progress) + \vspace{.5em} + \item switching reads to new nodes\\ + only once copy is finished + \end{itemize} + \vspace{1em} + \item \textbf{Implemented} in v0.10 + \vspace{1em} + \item \textbf{Validated} with Jepsen testing + \end{itemize} + \end{minipage} + \begin{minipage}{.23\textwidth} + \includegraphics[width=3cm]{../assets/jepsen-0.9.png}\\ + {\footnotesize Garage v0.9.0} + \end{minipage} + \begin{minipage}{.2\textwidth} + \includegraphics[width=3cm]{../assets/jepsen-0.10.png}\\ + {\footnotesize Garage v0.10 beta} + \end{minipage} +\end{frame} + +% ====================== v0.10.0 =============================== + +\begin{frame} + \begin{center} + \includegraphics[width=.8\linewidth]{../assets/timeline-22-24.pdf} + \end{center} +\end{frame} + +\begin{frame} + \frametitle{Towards v1.0} + Focus on \underline{security \& stability} + \vspace{2em} + \begin{itemize} + \item \textbf{Security audit} in progress by Radically Open Security + \vspace{1em} + \item Misc. S3 features (SSE-C, ...) and compatibility fixes + \vspace{1em} + \item Improve UX + \vspace{1em} + \item Fix bugs + \end{itemize} +\end{frame} + +% ======================================== OPERATING +% ======================================== OPERATING +% ======================================== OPERATING + + \section{Operating big Garage clusters} \begin{frame} \frametitle{Operating Garage} \begin{center} \only<1-2>{ - \includegraphics[width=.9\linewidth]{assets/scr_garage_status.png} + \includegraphics[width=.9\linewidth]{../assets/screenshots/garage_status_0.10.png} \\\vspace{1em} - \visible<2>{\includegraphics[width=.85\linewidth]{assets/scr_garage_status_broken.png}} + \visible<2>{\includegraphics[width=.9\linewidth]{../assets/screenshots/garage_status_unhealthy_0.10.png}} } \end{center} \end{frame} @@ -879,17 +626,17 @@ \begin{frame} \frametitle{Garage's architecture} \begin{center} - \only<1>{\includegraphics[width=.45\linewidth]{assets/garage.drawio.pdf}}% - \only<2>{\includegraphics[width=.6\linewidth]{assets/garage_sync.drawio.pdf}}% + \only<1>{\includegraphics[width=.45\linewidth]{../assets/garage.drawio.pdf}}% + \only<2>{\includegraphics[width=.6\linewidth]{../assets/garage_sync.drawio.pdf}}% \end{center} \end{frame} \begin{frame} \frametitle{Digging deeper} \begin{center} - \only<1>{\includegraphics[width=.9\linewidth]{assets/scr_garage_stats.png}} - \only<2>{\includegraphics[width=.6\linewidth]{assets/scr_garage_worker_list.png}} - \only<3>{\includegraphics[width=.6\linewidth]{assets/scr_garage_worker_get.png}} + \only<1>{\includegraphics[width=.9\linewidth]{../assets/screenshots/garage_stats_0.10.png}} + \only<2>{\includegraphics[width=.5\linewidth]{../assets/screenshots/garage_worker_list_0.10.png}} + \only<3>{\includegraphics[width=.6\linewidth]{../assets/screenshots/garage_worker_param_0.10.png}} \end{center} \end{frame} @@ -910,7 +657,6 @@ \begin{itemize} \item Lots of small files on disk \item Processing the resync queue can be slow - \item Multi-HDD support not yet released (soon!) \end{itemize} \end{itemize} \end{frame} @@ -926,7 +672,7 @@ \vspace{.5em} \item Data block storage: \begin{itemize} - \item Wait for v0.9 with multi-HDD support + \item Use Garage's native multi-HDD support \item XFS on individual drives \item Increase block size (1MB $\to$ 10MB, requires more RAM and good networking) \item Tune \texttt{resync-tranquility} and \texttt{resync-worker-count} dynamically @@ -943,146 +689,10 @@ Current deployments: $< 10$ TB, we don't have much experience with more \end{frame} -\section{Going further than the S3 API} -\begin{frame} - \frametitle{Using Garage for everything} - \begin{center} - \only<1>{\includegraphics[width=.8\linewidth]{assets/slideB1.png}}% - \only<2>{\includegraphics[width=.8\linewidth]{assets/slideB2.png}}% - \only<3>{\includegraphics[width=.8\linewidth]{assets/slideB3.png}}% - \end{center} -\end{frame} - -\begin{frame} - \frametitle{K2V Design} - \begin{itemize} - \item A new, custom, minimal API\\ - \vspace{.5em} - \begin{itemize} - \item Single-item operations - \item Operations on ranges and batches of items - \item Polling operations to help implement a PubSub pattern - \end{itemize} - \vspace{1em} - \item<2-> Exposes the partitoning mechanism of Garage\\ - K2V = partition key / sort key / value (like Dynamo) - \vspace{1em} - \item<3-> Weakly consistent, CRDT-friendly\\ - $\to$ no support for transactions (not ACID) - \vspace{1em} - \item<4-> Cryptography-friendly: values are binary blobs - \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Handling concurrent values} - \textbf{How to handle concurrency?} Example: - \vspace{1em} - \begin{enumerate} - \item Client $A$ reads the initial value of a key, $x_0$ - \vspace{1em} - \item<2-> Client $B$ also reads the initial value $x_0$ of that key - \vspace{1em} - \item<3-> Client $A$ modifies $x_0$, and writes a new value $x_1$ - \vspace{1em} - \item<4-> Client $B$ also modifies $x_0$, and writes a new value $x'_1$,\\ - without having a chance to first read $x_1$\\ - \vspace{1em} - $\to$ what should the final state be? - \end{enumerate} -\end{frame} - -\begin{frame} - \frametitle{Handling concurrent values} - \begin{itemize} - \item If we keep only $x_1$ or $x'_1$, we risk \textbf{loosing application data} - \vspace{1.5em} - \item<2-> Values are opaque binary blobs, \textbf{K2V cannot resolve conflicts} by itself\\ - (e.g. by implementing a CRDT) - \vspace{1.5em} - \item<3-> Solution: \textbf{we keep both!}\\ - $\to$ the value of the key is now $\{x_1, x'_1\}$\\ - $\to$ the client application can decide how to resolve conflicts on the next read - \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Keeping track of causality} - How does K2V know that $x_1$ and $x'_1$ are concurrent? - \vspace{1em} - \begin{itemize} - \item $read()$ returns \textbf{a set of values} and an associated \textbf{causality token}\\ - \vspace{1.5em} - \item<2-> When calling $write()$, the client sends \textbf{the causality token from its last read} - \vspace{1.5em} - \item<3-> The causality token represents the set of values \textbf{already seen by the client}\\ - $\to$ those values are the \textbf{causal past} of the write operation\\ - $\to$ K2V can keep concurrent values and overwrite all ones in the causal past - \vspace{1.5em} - \item<4-> Internally, the causality token is \textbf{a vector clock} - \end{itemize} -\end{frame} - -\begin{frame} - \frametitle{Application: an e-mail storage server} - \begin{center} - \only<1>{\includegraphics[width=.9\linewidth]{assets/aerogramme.png}}% - \end{center} -\end{frame} - -\begin{frame} - \frametitle{Aerogramme data model} - \begin{center} - \only<1->{\includegraphics[width=.4\linewidth]{assets/aerogramme_datatype.drawio.pdf}}% - \end{center} - \visible<2->{Aerogramme encrypts all stored values for privacy\\ - (Garage server administrators can't read your mail)} -\end{frame} - -\begin{frame} - \frametitle{Different deployment scenarios} - \begin{center} - \only<1>{\includegraphics[width=.9\linewidth]{assets/aerogramme_components1.drawio.pdf}}% - \only<2>{\includegraphics[width=.9\linewidth]{assets/aerogramme_components2.drawio.pdf}}% - \end{center} -\end{frame} - -\begin{frame} - \frametitle{A new model for building resilient software} - How to build an application using only Garage as a data store: - \vspace{1em} - \begin{enumerate} - \item Design a data model suited to K2V\\ - {\footnotesize (see Cassandra docs on porting SQL data models to Cassandra)} - \vspace{1em} - \begin{itemize} - \item Use CRDTs or other eventually consistent data types (see e.g. Bayou) - \vspace{1em} - \item Store opaque binary blobs to provide End-to-End Encryption\\ - \end{itemize} - \vspace{1em} - \item<2-> Store big blobs (files) using the S3 API - \vspace{1em} - \item<3-> Let Garage manage sharding, replication, failover, etc. - \end{enumerate} -\end{frame} - -\section{Conclusion} - -\begin{frame} - \frametitle{Perspectives} - \begin{itemize} - \item Fix the consistency issue when rebalancing - \vspace{1em} - \item Write about Garage's architecture and properties,\\ - and about our proposed architecture for (E2EE) apps over K2V+S3 - \vspace{1em} - \item Continue developing Garage; finish Aerogramme; build new applications... - \vspace{1em} - \item Anything else? - \end{itemize} -\end{frame} +% ======================================== END +% ======================================== END +% ======================================== END \begin{frame} \frametitle{Where to find us} @@ -1094,8 +704,8 @@ \texttt{\#garage:deuxfleurs.fr} on Matrix \vspace{1.5em} - \includegraphics[width=.06\linewidth]{assets/rust_logo.png} - \includegraphics[width=.13\linewidth]{assets/AGPLv3_Logo.png} + \includegraphics[width=.06\linewidth]{../assets/logos/rust_logo.png} + \includegraphics[width=.13\linewidth]{../assets/logos/AGPLv3_Logo.png} \end{center} \end{frame} diff --git a/doc/talks/assets/.gitignore b/doc/talks/assets/.gitignore index 26848b92..9ce0997d 100644 --- a/doc/talks/assets/.gitignore +++ b/doc/talks/assets/.gitignore @@ -1,6 +1,8 @@ # Files that are auto-generated when building pdfs deuxfleurs.pdf timeline-22-24.pdf +lattice*.pdf_tex +lattice*.pdf # tmp files generated by krita *~ diff --git a/doc/talks/assets/AGPLv3_Logo.png b/doc/talks/assets/AGPLv3_Logo.png deleted file mode 100644 index 445284a3..00000000 Binary files a/doc/talks/assets/AGPLv3_Logo.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/garage.drawio.pdf b/doc/talks/assets/garage.drawio.pdf similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/garage.drawio.pdf rename to doc/talks/assets/garage.drawio.pdf diff --git a/doc/talks/2024-02-03-fosdem/assets/garage.drawio.png b/doc/talks/assets/garage.drawio.png similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/garage.drawio.png rename to doc/talks/assets/garage.drawio.png diff --git a/doc/talks/2024-02-03-fosdem/assets/garage_sync.drawio.pdf b/doc/talks/assets/garage_sync.drawio.pdf similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/garage_sync.drawio.pdf rename to doc/talks/assets/garage_sync.drawio.pdf diff --git a/doc/talks/2024-02-03-fosdem/assets/garage_sync.drawio.png b/doc/talks/assets/garage_sync.drawio.png similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/garage_sync.drawio.png rename to doc/talks/assets/garage_sync.drawio.png diff --git a/doc/talks/assets/jepsen-0.10.png b/doc/talks/assets/jepsen-0.10.png new file mode 100644 index 00000000..d7895e31 Binary files /dev/null and b/doc/talks/assets/jepsen-0.10.png differ diff --git a/doc/talks/assets/jepsen-0.9.png b/doc/talks/assets/jepsen-0.9.png new file mode 100644 index 00000000..3f654038 Binary files /dev/null and b/doc/talks/assets/jepsen-0.9.png differ diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice1.svg b/doc/talks/assets/lattice/lattice1.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice1.svg rename to doc/talks/assets/lattice/lattice1.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice2.svg b/doc/talks/assets/lattice/lattice2.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice2.svg rename to doc/talks/assets/lattice/lattice2.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice3.svg b/doc/talks/assets/lattice/lattice3.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice3.svg rename to doc/talks/assets/lattice/lattice3.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice4.svg b/doc/talks/assets/lattice/lattice4.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice4.svg rename to doc/talks/assets/lattice/lattice4.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice5.svg b/doc/talks/assets/lattice/lattice5.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice5.svg rename to doc/talks/assets/lattice/lattice5.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice6.svg b/doc/talks/assets/lattice/lattice6.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice6.svg rename to doc/talks/assets/lattice/lattice6.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice7.svg b/doc/talks/assets/lattice/lattice7.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice7.svg rename to doc/talks/assets/lattice/lattice7.svg diff --git a/doc/talks/2024-02-03-fosdem/assets/lattice8.svg b/doc/talks/assets/lattice/lattice8.svg similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/lattice8.svg rename to doc/talks/assets/lattice/lattice8.svg diff --git a/doc/talks/assets/location-aware.png b/doc/talks/assets/location-aware.png deleted file mode 100644 index f5966865..00000000 Binary files a/doc/talks/assets/location-aware.png and /dev/null differ diff --git a/doc/talks/2024-02-03-fosdem/assets/AGPLv3_Logo.png b/doc/talks/assets/logos/AGPLv3_Logo.png similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/AGPLv3_Logo.png rename to doc/talks/assets/logos/AGPLv3_Logo.png diff --git a/doc/talks/assets/Amazon-S3.jpg b/doc/talks/assets/logos/Amazon-S3.jpg similarity index 100% rename from doc/talks/assets/Amazon-S3.jpg rename to doc/talks/assets/logos/Amazon-S3.jpg diff --git a/doc/talks/assets/NGI0Entrust_tag.png b/doc/talks/assets/logos/NGI0Entrust_tag.png similarity index 100% rename from doc/talks/assets/NGI0Entrust_tag.png rename to doc/talks/assets/logos/NGI0Entrust_tag.png diff --git a/doc/talks/assets/NGI0Entrust_tag.svg b/doc/talks/assets/logos/NGI0Entrust_tag.svg similarity index 100% rename from doc/talks/assets/NGI0Entrust_tag.svg rename to doc/talks/assets/logos/NGI0Entrust_tag.svg diff --git a/doc/talks/assets/capitole_du_libre.png b/doc/talks/assets/logos/capitole_du_libre.png similarity index 100% rename from doc/talks/assets/capitole_du_libre.png rename to doc/talks/assets/logos/capitole_du_libre.png diff --git a/doc/talks/assets/deuxfleurs.svg b/doc/talks/assets/logos/deuxfleurs.svg similarity index 100% rename from doc/talks/assets/deuxfleurs.svg rename to doc/talks/assets/logos/deuxfleurs.svg diff --git a/doc/talks/assets/fosdem22.png b/doc/talks/assets/logos/fosdem22.png similarity index 100% rename from doc/talks/assets/fosdem22.png rename to doc/talks/assets/logos/fosdem22.png diff --git a/doc/talks/assets/fosdem24.png b/doc/talks/assets/logos/fosdem24.png similarity index 100% rename from doc/talks/assets/fosdem24.png rename to doc/talks/assets/logos/fosdem24.png diff --git a/doc/talks/assets/jdll.png b/doc/talks/assets/logos/jdll.png similarity index 100% rename from doc/talks/assets/jdll.png rename to doc/talks/assets/logos/jdll.png diff --git a/doc/talks/assets/logo_chatons.png b/doc/talks/assets/logos/logo_chatons.png similarity index 100% rename from doc/talks/assets/logo_chatons.png rename to doc/talks/assets/logos/logo_chatons.png diff --git a/doc/talks/assets/minio.png b/doc/talks/assets/logos/minio.png similarity index 100% rename from doc/talks/assets/minio.png rename to doc/talks/assets/logos/minio.png diff --git a/doc/talks/assets/ngi-pointer.png b/doc/talks/assets/logos/ngi-pointer.png similarity index 100% rename from doc/talks/assets/ngi-pointer.png rename to doc/talks/assets/logos/ngi-pointer.png diff --git a/doc/talks/assets/nlnet.svg b/doc/talks/assets/logos/nlnet.svg similarity index 100% rename from doc/talks/assets/nlnet.svg rename to doc/talks/assets/logos/nlnet.svg diff --git a/doc/talks/assets/pses.png b/doc/talks/assets/logos/pses.png similarity index 100% rename from doc/talks/assets/pses.png rename to doc/talks/assets/logos/pses.png diff --git a/doc/talks/2024-02-03-fosdem/assets/rust_logo.png b/doc/talks/assets/logos/rust_logo.png similarity index 100% rename from doc/talks/2024-02-03-fosdem/assets/rust_logo.png rename to doc/talks/assets/logos/rust_logo.png diff --git a/doc/talks/assets/db_engine.png b/doc/talks/assets/perf/db_engine.png similarity index 100% rename from doc/talks/assets/db_engine.png rename to doc/talks/assets/perf/db_engine.png diff --git a/doc/talks/assets/endpoint_latency_0.7_0.8_minio.png b/doc/talks/assets/perf/endpoint_latency_0.7_0.8_minio.png similarity index 100% rename from doc/talks/assets/endpoint_latency_0.7_0.8_minio.png rename to doc/talks/assets/perf/endpoint_latency_0.7_0.8_minio.png diff --git a/doc/talks/assets/io-0.7-0.8-minio.png b/doc/talks/assets/perf/io-0.7-0.8-minio.png similarity index 100% rename from doc/talks/assets/io-0.7-0.8-minio.png rename to doc/talks/assets/perf/io-0.7-0.8-minio.png diff --git a/doc/talks/assets/ttfb.png b/doc/talks/assets/perf/ttfb.png similarity index 100% rename from doc/talks/assets/ttfb.png rename to doc/talks/assets/perf/ttfb.png diff --git a/doc/talks/assets/rust_logo.png b/doc/talks/assets/rust_logo.png deleted file mode 100644 index 0e4809ec..00000000 Binary files a/doc/talks/assets/rust_logo.png and /dev/null differ diff --git a/doc/talks/assets/screenshots/garage_stats_0.10.png b/doc/talks/assets/screenshots/garage_stats_0.10.png new file mode 100644 index 00000000..78a36ead Binary files /dev/null and b/doc/talks/assets/screenshots/garage_stats_0.10.png differ diff --git a/doc/talks/assets/screenshots/garage_status_0.10.png b/doc/talks/assets/screenshots/garage_status_0.10.png new file mode 100644 index 00000000..510717ca Binary files /dev/null and b/doc/talks/assets/screenshots/garage_status_0.10.png differ diff --git a/doc/talks/assets/screenshots/garage_status_0.9_prod.png b/doc/talks/assets/screenshots/garage_status_0.9_prod.png new file mode 100644 index 00000000..e1a05899 Binary files /dev/null and b/doc/talks/assets/screenshots/garage_status_0.9_prod.png differ diff --git a/doc/talks/assets/screenshots/garage_status_0.9_prod_zonehl.png b/doc/talks/assets/screenshots/garage_status_0.9_prod_zonehl.png new file mode 100644 index 00000000..99d46f98 Binary files /dev/null and b/doc/talks/assets/screenshots/garage_status_0.9_prod_zonehl.png differ diff --git a/doc/talks/assets/screenshots/garage_status_unhealthy_0.10.png b/doc/talks/assets/screenshots/garage_status_unhealthy_0.10.png new file mode 100644 index 00000000..b167687d Binary files /dev/null and b/doc/talks/assets/screenshots/garage_status_unhealthy_0.10.png differ diff --git a/doc/talks/assets/screenshots/garage_worker_list_0.10.png b/doc/talks/assets/screenshots/garage_worker_list_0.10.png new file mode 100644 index 00000000..078f0607 Binary files /dev/null and b/doc/talks/assets/screenshots/garage_worker_list_0.10.png differ diff --git a/doc/talks/assets/screenshots/garage_worker_param_0.10.png b/doc/talks/assets/screenshots/garage_worker_param_0.10.png new file mode 100644 index 00000000..39ee11aa Binary files /dev/null and b/doc/talks/assets/screenshots/garage_worker_param_0.10.png differ diff --git a/doc/talks/assets/grafana_dashboard.png b/doc/talks/assets/screenshots/grafana_dashboard.png similarity index 100% rename from doc/talks/assets/grafana_dashboard.png rename to doc/talks/assets/screenshots/grafana_dashboard.png diff --git a/doc/talks/assets/jaeger_listobjects.png b/doc/talks/assets/screenshots/jaeger_listobjects.png similarity index 100% rename from doc/talks/assets/jaeger_listobjects.png rename to doc/talks/assets/screenshots/jaeger_listobjects.png diff --git a/doc/talks/assets/jaeger_putobject.png b/doc/talks/assets/screenshots/jaeger_putobject.png similarity index 100% rename from doc/talks/assets/jaeger_putobject.png rename to doc/talks/assets/screenshots/jaeger_putobject.png diff --git a/doc/talks/shell.nix b/doc/talks/shell.nix index 161a61e1..bbee0714 100644 --- a/doc/talks/shell.nix +++ b/doc/talks/shell.nix @@ -5,7 +5,7 @@ let scheme-basic beamer amsmath mathtools breqn environ - multirow graphics import adjustbox tabu vwcol stmaryrd ulem ragged2e + multirow graphics import adjustbox tabu vwcol stmaryrd ulem ragged2e textpos dvisvgm dvipng wrapfig hyperref capt-of; }); in pkgs.mkShell { nativeBuildInputs = [ pkgs.gnumake latex ]; }