aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-04-10 14:38:14 +0200
committerAlex Auvolat <alex@adnab.me>2024-04-10 14:38:14 +0200
commitff093ddbb8485409f389abe7b5e569cb38d222d2 (patch)
treedd19e317663113277dc4f7c5a2c1d3869c7f5db6
parent90e3c2af915251720a4253f78f3f1b4ba844800d (diff)
parent738bb2f09c09f7532558214065b8e0abbea0edd1 (diff)
downloadgarage-1.0.0.tar.gz
garage-1.0.0.zip
Merge branch 'main' into next-0.10v1.0.0next-0.10
-rw-r--r--doc/book/reference-manual/configuration.md8
-rw-r--r--script/jepsen.garage/Vagrantfile14
-rwxr-xr-xscript/jepsen.garage/all_tests_1.sh7
-rw-r--r--script/jepsen.garage/src/jepsen/garage.clj4
-rw-r--r--script/jepsen.garage/src/jepsen/garage/daemon.clj2
5 files changed, 19 insertions, 16 deletions
diff --git a/doc/book/reference-manual/configuration.md b/doc/book/reference-manual/configuration.md
index 49bff05b..fdeedf22 100644
--- a/doc/book/reference-manual/configuration.md
+++ b/doc/book/reference-manual/configuration.md
@@ -390,10 +390,12 @@ if geographical replication is used.
If this value is set, Garage will automatically take a snapshot of the metadata
DB file at a regular interval and save it in the metadata directory.
-This can allow to recover from situations where the metadata DB file is corrupted,
-for instance after an unclean shutdown.
-See [this page](@/documentation/operations/recovering.md#corrupted_meta) for details.
+This parameter can take any duration string that can be parsed by
+the [`parse_duration`](https://docs.rs/parse_duration/latest/parse_duration/#syntax) crate.
+Snapshots can allow to recover from situations where the metadata DB file is
+corrupted, for instance after an unclean shutdown. See [this
+page](@/documentation/operations/recovering.md#corrupted_meta) for details.
Garage keeps only the two most recent snapshots of the metadata DB and deletes
older ones automatically.
diff --git a/script/jepsen.garage/Vagrantfile b/script/jepsen.garage/Vagrantfile
index b54c2426..2ac24f98 100644
--- a/script/jepsen.garage/Vagrantfile
+++ b/script/jepsen.garage/Vagrantfile
@@ -30,11 +30,11 @@ Vagrant.configure("2") do |config|
config.vm.define "n6" do |config| vm(config, "n6", "192.168.56.26") end
config.vm.define "n7" do |config| vm(config, "n7", "192.168.56.27") end
- config.vm.define "n8" do |config| vm(config, "n8", "192.168.56.28") end
- config.vm.define "n9" do |config| vm(config, "n9", "192.168.56.29") end
- config.vm.define "n10" do |config| vm(config, "n10", "192.168.56.30") end
- config.vm.define "n11" do |config| vm(config, "n11", "192.168.56.31") end
- config.vm.define "n12" do |config| vm(config, "n12", "192.168.56.32") end
- config.vm.define "n13" do |config| vm(config, "n13", "192.168.56.33") end
- config.vm.define "n14" do |config| vm(config, "n14", "192.168.56.34") end
+ #config.vm.define "n8" do |config| vm(config, "n8", "192.168.56.28") end
+ #config.vm.define "n9" do |config| vm(config, "n9", "192.168.56.29") end
+ #config.vm.define "n10" do |config| vm(config, "n10", "192.168.56.30") end
+ #config.vm.define "n11" do |config| vm(config, "n11", "192.168.56.31") end
+ #config.vm.define "n12" do |config| vm(config, "n12", "192.168.56.32") end
+ #config.vm.define "n13" do |config| vm(config, "n13", "192.168.56.33") end
+ #config.vm.define "n14" do |config| vm(config, "n14", "192.168.56.34") end
end
diff --git a/script/jepsen.garage/all_tests_1.sh b/script/jepsen.garage/all_tests_1.sh
index b5397d13..f9770865 100755
--- a/script/jepsen.garage/all_tests_1.sh
+++ b/script/jepsen.garage/all_tests_1.sh
@@ -3,11 +3,10 @@
set -x
#for ppatch in task3c task3a tsfix2; do
-for ppatch in tsfix2; do
+for ppatch in v093 v1rc1; do
#for psc in c cp cdp r pr cpr dpr; do
- for psc in cdp r pr cpr dpr; do
- #for ptsk in reg2 set1 set2; do
- for ptsk in set1; do
+ for ptsk in reg2 set2; do
+ for psc in c cp cdp r pr cpr dpr; do
for irun in $(seq 10); do
lein run test --nodes-file nodes.vagrant \
--time-limit 60 --rate 100 --concurrency 100 --ops-per-key 100 \
diff --git a/script/jepsen.garage/src/jepsen/garage.clj b/script/jepsen.garage/src/jepsen/garage.clj
index 446b81de..053ad8b6 100644
--- a/script/jepsen.garage/src/jepsen/garage.clj
+++ b/script/jepsen.garage/src/jepsen/garage.clj
@@ -38,7 +38,9 @@
"tsfix2" "c82d91c6bccf307186332b6c5c6fc0b128b1b2b1"
"task3a" "707442f5de416fdbed4681a33b739f0a787b7834"
"task3b" "431b28e0cfdc9cac6c649193cf602108a8b02997"
- "task3c" "0041b013a473e3ae72f50209d8f79db75a72848b"})
+ "task3c" "0041b013a473e3ae72f50209d8f79db75a72848b"
+ "v093" "v0.9.3"
+ "v1rc1" "v1.0.0-rc1"})
(def cli-opts
"Additional command line options."
diff --git a/script/jepsen.garage/src/jepsen/garage/daemon.clj b/script/jepsen.garage/src/jepsen/garage/daemon.clj
index d407dd29..0ea773fb 100644
--- a/script/jepsen.garage/src/jepsen/garage/daemon.clj
+++ b/script/jepsen.garage/src/jepsen/garage/daemon.clj
@@ -43,7 +43,7 @@
"rpc_bind_addr = \"0.0.0.0:3901\"\n"
"rpc_public_addr = \"" node ":3901\"\n"
"db_engine = \"lmdb\"\n"
- "replication_mode = \"2\"\n"
+ "replication_mode = \"3\"\n"
"data_dir = \"" data-dir "\"\n"
"metadata_dir = \"" meta-dir "\"\n"
"[s3_api]\n"