diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-10-25 11:41:34 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-10-25 11:41:34 +0200 |
| commit | db921cc05f8bcfccd0d0ba1d90b6dcd77f06dcdd (patch) | |
| tree | e2dadcb33d8cdc6eae93cbf7819fae7693df35b5 /script/jepsen.garage/src/jepsen/garage.clj | |
| parent | 4fa2646a75ed9b4823bf36ae6218a18cca11c471 (diff) | |
| download | garage-db921cc05f8bcfccd0d0ba1d90b6dcd77f06dcdd.tar.gz garage-db921cc05f8bcfccd0d0ba1d90b6dcd77f06dcdd.zip | |
jepsen: reconfigure nemesis + add db nemesis
Diffstat (limited to 'script/jepsen.garage/src/jepsen/garage.clj')
| -rw-r--r-- | script/jepsen.garage/src/jepsen/garage.clj | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/script/jepsen.garage/src/jepsen/garage.clj b/script/jepsen.garage/src/jepsen/garage.clj index a67399e0..3fe527a6 100644 --- a/script/jepsen.garage/src/jepsen/garage.clj +++ b/script/jepsen.garage/src/jepsen/garage.clj @@ -27,7 +27,8 @@ "cp" grgNemesis/scenario-cp "r" grgNemesis/scenario-r "pr" grgNemesis/scenario-pr - "cpr" grgNemesis/scenario-cpr}) + "cpr" grgNemesis/scenario-cpr + "dpr" grgNemesis/scenario-dpr}) (def patches "A map of patch names to Garage builds" @@ -59,15 +60,16 @@ "Given an options map from the command line runner (e.g. :nodes, :ssh, :concurrency, ...), constructs a test map." [opts] - (let [workload ((get workloads (:workload opts)) opts) - scenario ((get scenari (:scenario opts)) opts) - garage-version (get patches (:patch opts))] + (let [garage-version (get patches (:patch opts)) + db (grg/db garage-version) + workload ((get workloads (:workload opts)) opts) + scenario ((get scenari (:scenario opts)) (assoc opts :db db))] (merge tests/noop-test opts {:pure-generators true :name (str "garage " (name (:workload opts))) :os debian/os - :db (grg/db garage-version) + :db db :client (:client workload) :generator (gen/phases (->> @@ -82,7 +84,7 @@ (gen/clients (:final-generator workload))) :nemesis (:nemesis scenario) :checker (checker/compose - {:perf (checker/perf) + {:perf (checker/perf (:perf scenario)) :workload (:checker workload)}) }))) |