networkException/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Pull requests Activity

set tests with independant tests together

Browse source
This commit is contained in:
Alex 2023-04-19 16:16:34 +02:00
parent 4e0584a438
commit 70f042131f
2 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
script/jepsen.garage/README.md
View file

@ -24,6 +24,13 @@ Run tests (this one should fail):
lein run test --nodes-file nodes.vagrant --time-limit 64 --concurrency 50 --rate 50 --workload reg lein run test --nodes-file nodes.vagrant --time-limit 64 --concurrency 50 --rate 50 --workload reg
``` ```
These ones are working:
```
lein run test --nodes-file nodes.vagrant --time-limit 64 --rate 50 --concurrency 50 --workload set1
lein run test --nodes-file nodes.vagrant --time-limit 64 --rate 50 --concurrency 50 --workload set2
```
## License ## License
Copyright © 2023 Alex Auvolat Copyright © 2023 Alex Auvolat

41
script/jepsen.garage/src/jepsen/garage/set.clj
View file

@ -28,14 +28,18 @@
(assoc this :creds creds))) (assoc this :creds creds)))
(setup! [this test]) (setup! [this test])
(invoke! [this test op] (invoke! [this test op]
(let [[k v] (:value op)
prefix (str "set" k "/")]
(case (:f op) (case (:f op)
:add :add
(do (do
(grg/s3-put (:creds this) (str (:value op)) "present") (grg/s3-put (:creds this) (str prefix v) "present")
(assoc op :type :ok)) (assoc op :type :ok))
:read :read
(let [items (grg/s3-list (:creds this) "")] (let [items (grg/s3-list (:creds this) prefix)
(assoc op :type :ok, :value (set (map read-string items)))))) 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))))))
(teardown! [this test]) (teardown! [this test])
(close! [this test])) (close! [this test]))
@ -43,22 +47,33 @@
"Tests insertions and deletions" "Tests insertions and deletions"
[opts] [opts]
{:client (SetClient. nil) {:client (SetClient. nil)
:checker (checker/compose :checker (independent/checker
(checker/compose
{:set (checker/set) {:set (checker/set)
:timeline (timeline/html)}) :timeline (timeline/html)}))
; :generator (gen/mix [op-add op-read]) :generator (independent/concurrent-generator
:generator (->> (range) 10
(map (fn [x] {:type :invoke, :f :add, :value x}))) (range 100)
:final-generator (gen/once op-read)}) (fn [k]
(->>
(gen/mix [op-add])
(gen/limit (:ops-per-key opts)))))
:final-generator (independent/sequential-generator
(range 100)
(fn [k] (gen/once op-read)))})
(defn workload2 (defn workload2
"Tests insertions and deletions" "Tests insertions and deletions"
[opts] [opts]
{:client (SetClient. nil) {:client (SetClient. nil)
:checker (checker/compose :checker (independent/checker
(checker/compose
{:set (checker/set-full {:linearizable? false}) {:set (checker/set-full {:linearizable? false})
:timeline (timeline/html)}) :timeline (timeline/html)}))
:generator (gen/mix [op-read :generator (independent/concurrent-generator
(->> (range) (map (fn [x] {:type :invoke, :f :add, :value x})))])}) 10
(range 100)
(fn [k]
(gen/mix [op-add op-read])))})