diff options
Diffstat (limited to 'script/jepsen.garage/src/jepsen')
| -rw-r--r-- | script/jepsen.garage/src/jepsen/garage.clj | 10 | ||||
| -rw-r--r-- | script/jepsen.garage/src/jepsen/garage/set.clj | 12 |
2 files changed, 14 insertions, 8 deletions
diff --git a/script/jepsen.garage/src/jepsen/garage.clj b/script/jepsen.garage/src/jepsen/garage.clj index 174e8df0..446b81de 100644 --- a/script/jepsen.garage/src/jepsen/garage.clj +++ b/script/jepsen.garage/src/jepsen/garage.clj @@ -36,7 +36,9 @@ {"default" "v0.9.0" "tsfix1" "d146cdd5b66ca1d3ed65ce93ca42c6db22defc09" "tsfix2" "c82d91c6bccf307186332b6c5c6fc0b128b1b2b1" - "task3a" "707442f5de416fdbed4681a33b739f0a787b7834"}) + "task3a" "707442f5de416fdbed4681a33b739f0a787b7834" + "task3b" "431b28e0cfdc9cac6c649193cf602108a8b02997" + "task3c" "0041b013a473e3ae72f50209d8f79db75a72848b"}) (def cli-opts "Additional command line options." @@ -69,7 +71,7 @@ (merge tests/noop-test opts {:pure-generators true - :name (str "garage " (name (:workload opts)) " " (name (:scenario opts)) " " (name (:patch opts))) + :name (str "garage-" (name (:patch opts)) " " (name (:workload opts)) " " (name (:scenario opts))) :os debian/os :db db :client (:client workload) @@ -83,7 +85,9 @@ (gen/nemesis (:final-generator scenario)) (gen/log "Waiting for recovery") (gen/sleep 10) - (gen/clients (:final-generator workload))) + (gen/log "Running final generator") + (gen/clients (:final-generator workload)) + (gen/log "Generators all done")) :nemesis (:nemesis scenario) :checker (checker/compose {:perf (checker/perf (:perf scenario)) diff --git a/script/jepsen.garage/src/jepsen/garage/set.clj b/script/jepsen.garage/src/jepsen/garage/set.clj index a73b8efc..2c7a2ccd 100644 --- a/script/jepsen.garage/src/jepsen/garage/set.clj +++ b/script/jepsen.garage/src/jepsen/garage/set.clj @@ -108,11 +108,13 @@ (->> (range) (map (fn [x] {:type :invoke, :f :add, :value x})) (gen/limit (:ops-per-key opts))))) - :final-generator (gen/phases - (independent/sequential-generator - (range 100) - (fn [k] (gen/once op-read))) - (gen/sleep 5))}) + :final-generator (independent/concurrent-generator + 10 + (range 100) + (fn [k] + (gen/phases + (gen/once op-read) + (gen/sleep 5))))}) (defn workload2 "Tests insertions and deletions" |