From 919e72fc488d1ee6016f6586495323c9c6aa8ebf Mon Sep 17 00:00:00 2001 From: Antonio Andelic Date: Wed, 15 Jun 2022 12:11:23 +0000 Subject: [PATCH] Add perf tests to all jepsen runs --- .../src/jepsen/clickhouse_keeper/counter.clj | 4 +++- .../src/jepsen/clickhouse_keeper/queue.clj | 4 +++- .../src/jepsen/clickhouse_keeper/register.clj | 1 + .../src/jepsen/clickhouse_keeper/set.clj | 4 +++- .../src/jepsen/clickhouse_keeper/unique.clj | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj index dfccf7dd635..f82d3f4c348 100644 --- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj +++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/counter.clj @@ -43,7 +43,9 @@ "A generator, client, and checker for a set test." [opts] {:client (CounterClient. nil nil) - :checker (checker/counter) + :checker (checker/compose + {:counter (checker/counter) + :perf (checker/perf)}) :generator (->> (range) (map (fn [x] (->> (gen/mix [r add]))))) diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj index 30ff7c01ec4..3aeaa328606 100644 --- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj +++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/queue.clj @@ -59,7 +59,8 @@ {:client (QueueClient. nil nil) :checker (checker/compose {:total-queue (checker/total-queue) - :timeline (timeline/html)}) + :perf (checker/perf) + :timeline (timeline/html)}) :generator (->> (sorted-str-range 50000) (map (fn [x] (rand-nth [{:type :invoke, :f :enqueue :value x} @@ -72,6 +73,7 @@ :checker (checker/compose {:linear (checker/linearizable {:model (model/unordered-queue) :algorithm :linear}) + :perf (checker/perf) :timeline (timeline/html)}) :generator (->> (sorted-str-range 10000) (map (fn [x] diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj index b2f381168bd..a1605192b51 100644 --- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj +++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/register.clj @@ -55,6 +55,7 @@ (checker/compose {:linear (checker/linearizable {:model (model/cas-register) :algorithm :linear}) + :perf (checker/perf) :timeline (timeline/html)})) :generator (independent/concurrent-generator 10 diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj index 79ec4f824bb..b992a6abcbb 100644 --- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj +++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj @@ -44,7 +44,9 @@ "A generator, client, and checker for a set test." [opts] {:client (SetClient. "/a-set" nil nil) - :checker (checker/set) + :checker (checker/compose + {:set (checker/set) + :perf (checker/perf)}) :generator (->> (range) (map (fn [x] {:type :invoke, :f :add, :value x}))) :final-generator (gen/once {:type :invoke, :f :read, :value nil})}) diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj index c50f33924e0..752240722d8 100644 --- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj +++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/unique.clj @@ -36,7 +36,9 @@ "A generator, client, and checker for a set test." [opts] {:client (UniqueClient. nil nil) - :checker (checker/unique-ids) + :checker (checker/compose + {:perf (checker/perf) + :unique (checker/unique-ids)}) :generator (->> (range) (map (fn [_] {:type :invoke, :f :generate})))})