diff options
Diffstat (limited to 'script/jepsen.garage/src/jepsen')
| -rw-r--r-- | script/jepsen.garage/src/jepsen/garage.clj | 14 | ||||
| -rw-r--r-- | script/jepsen.garage/src/jepsen/garage/reg.clj | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/script/jepsen.garage/src/jepsen/garage.clj b/script/jepsen.garage/src/jepsen/garage.clj index be192a7f..ce02b7f7 100644 --- a/script/jepsen.garage/src/jepsen/garage.clj +++ b/script/jepsen.garage/src/jepsen/garage.clj @@ -20,10 +20,16 @@ "set1" set/workload1 "set2" set/workload2}) +(def patches + "A map of patch names to Garage builds" + {"default" "v0.9.0" + "tsfix1" "d146cdd5b66ca1d3ed65ce93ca42c6db22defc09"}) + (def cli-opts "Additional command line options." - [["-I" "--increasing-timestamps" "Garage version with increasing timestamps on PutObject" - :default false] + [["-p" "--patch NAME" "Garage patch to use" + :default "default" + :validate [patches (cli/one-of patches)]] ["-r" "--rate HZ" "Approximate number of requests per second, per thread." :default 10 :parse-fn read-string @@ -41,9 +47,7 @@ :concurrency, ...), constructs a test map." [opts] (let [workload ((get workloads (:workload opts)) opts) - garage-version (if (:increasing-timestamps opts) - "d146cdd5b66ca1d3ed65ce93ca42c6db22defc09" - "v0.9.0")] + garage-version (get patches (:patch opts))] (merge tests/noop-test opts {:pure-generators true diff --git a/script/jepsen.garage/src/jepsen/garage/reg.clj b/script/jepsen.garage/src/jepsen/garage/reg.clj index 6772abfe..ecc96590 100644 --- a/script/jepsen.garage/src/jepsen/garage/reg.clj +++ b/script/jepsen.garage/src/jepsen/garage/reg.clj @@ -112,7 +112,8 @@ (range) (fn [k] (->> - (gen/mix [op-get op-put op-del]) + ; (gen/mix [op-get op-put op-del]) + (gen/mix [op-get op-put]) (gen/limit (:ops-per-key opts)))))}) (defn workload1 |