gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-24 11:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

jepsen: refactoring

Browse Source
This commit is contained in:
Alex Auvolat
2023-10-19 14:34:19 +02:00
parent b3bf16ee27
commit 74e50edddd
5 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/jepsen.garage/src/jepsen/garage.clj
+4 -4
View File
@@ -56,12 +56,12 @@
(gen/stagger (/ (:rate opts)))
(gen/nemesis
(cycle [(gen/sleep 5)
;{:type :info, :f :partition-start}
;(gen/sleep 5)
{:type :info, :f :partition-start}
(gen/sleep 5)
{:type :info, :f :clock-scramble}
(gen/sleep 5)
;{:type :info, :f :partition-stop}
;(gen/sleep 5)
{:type :info, :f :partition-stop}
(gen/sleep 5)
{:type :info, :f :clock-scramble}]))
(gen/time-limit (:time-limit opts)))
(gen/log "Healing cluster")
script/jepsen.garage/src/jepsen/garage/daemon.clj
+1 -1
View File
@@ -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 = \"3\"\n"
"replication_mode = \"2\"\n"
"data_dir = \"" data-dir "\"\n"
"metadata_dir = \"" meta-dir "\"\n"
"[s3_api]\n"
script/jepsen.garage/src/jepsen/garage/reg.clj
+13 -14
View File
@@ -9,6 +9,7 @@
[generator :as gen]
[independent :as independent]
[nemesis :as nemesis]
[util :as util]
[tests :as tests]]
[jepsen.checker.timeline :as timeline]
[jepsen.control.util :as cu]
@@ -25,33 +26,31 @@
(defrecord RegClient [creds]
client/Client
(open! [this test node]
(let [creds (grg/creds node)]
(info node "s3 credentials:" creds)
(assoc this :creds creds)))
(assoc this :creds (grg/creds node)))
(setup! [this test])
(invoke! [this test op]
(let [[k v] (:value op)]
(case (:f op)
:read
(try+
(util/timeout
10000
(assoc op :type :fail, :error ::timeout)
(let [value (s3/get (:creds this) k)]
(assoc op :type :ok, :value (independent/tuple k value)))
(catch (re-find #"Unavailable" (.getMessage %)) ex
(assoc op :type :fail, :error [:s3-error (.getMessage ex)])))
(assoc op :type :ok, :value (independent/tuple k value))))
:write
(try+
(util/timeout
10000
(assoc op :type :info, :error ::timeout)
(do
(s3/put (:creds this) k v)
(assoc op :type :ok))
(catch (re-find #"Unavailable" (.getMessage %)) ex
(assoc op :type :fail, :error [:s3-error (.getMessage ex)]))))))
(assoc op :type :ok))))))
(teardown! [this test])
(close! [this test]))
(defn workload
"Tests linearizable reads and writes"
[opts]
{:client (client/timeout 10 (RegClient. nil))
{:client (RegClient. nil)
:checker (independent/checker
(checker/compose
{:linear (checker/linearizable
@@ -59,8 +58,8 @@
:algorithm :linear})
:timeline (timeline/html)}))
:generator (independent/concurrent-generator
(/ (:concurrency opts) 10) ; divide threads in 10 groups
(range) ; working on 10 keys
10
(range)
(fn [k]
(->>
(gen/mix [op-get op-put op-del])
script/jepsen.garage/src/jepsen/garage/set.clj
+19 -11
View File
@@ -11,6 +11,7 @@
[generator :as gen]
[independent :as independent]
[nemesis :as nemesis]
[util :as util]
[tests :as tests]]
[jepsen.checker.timeline :as timeline]
[jepsen.control.util :as cu]
@@ -26,23 +27,29 @@
(defrecord SetClient [creds]
client/Client
(open! [this test node]
(let [creds (grg/creds node)]
(info node "s3 credentials:" creds)
(assoc this :creds creds)))
(assoc this :creds (grg/creds node)))
(setup! [this test])
(invoke! [this test op]
(let [[k v] (:value op)
prefix (str "set" k "/")]
(case (:f op)
:add
(do
(s3/put (:creds this) (str prefix v) "present")
(assoc op :type :ok))
(util/timeout
10000
(assoc op :type :info, :error ::timeout)
(do
(s3/put (:creds this) (str prefix v) "present")
(assoc op :type :ok)))
:read
(let [items (s3/list (:creds this) prefix)
items-stripped (map (fn [o] (str/replace-first o prefix "")) items)
items-set (set (map read-string items-stripped))]
(assoc op :type :ok, :value (independent/tuple k items-set))))))
(util/timeout
10000
(assoc op :type :fail, :error ::timeout)
(let [items (s3/list (:creds this) prefix)
items-stripped (map (fn [o]
(assert (str/starts-with? o prefix))
(str/replace-first o prefix "")) items)
items-set (set (map parse-long items-stripped))]
(assoc op :type :ok, :value (independent/tuple k items-set)))))))
(teardown! [this test])
(close! [this test]))
@@ -110,6 +117,7 @@
10
(range)
(fn [k]
(gen/mix [op-add-rand100 op-read])))})
(->> (gen/mix [op-add-rand100 op-read])
(gen/limit (:ops-per-key opts)))))})