From d13bde5e26098313e789dd3793368a635cf1cc16 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 24 Oct 2023 15:44:05 +0200
Subject: jepsen: set1 and set2 don't fail anymore ??

---
 script/jepsen.garage/src/jepsen/garage.clj         |  3 +-
 script/jepsen.garage/src/jepsen/garage/nemesis.clj | 64 ++++++++++++----------
 2 files changed, 38 insertions(+), 29 deletions(-)

(limited to 'script/jepsen.garage/src/jepsen')

diff --git a/script/jepsen.garage/src/jepsen/garage.clj b/script/jepsen.garage/src/jepsen/garage.clj
index 6d64a1b8..a67399e0 100644
--- a/script/jepsen.garage/src/jepsen/garage.clj
+++ b/script/jepsen.garage/src/jepsen/garage.clj
@@ -26,7 +26,8 @@
   {"c" grgNemesis/scenario-c
    "cp" grgNemesis/scenario-cp
    "r"  grgNemesis/scenario-r
-   "pr"  grgNemesis/scenario-pr})
+   "pr"  grgNemesis/scenario-pr
+   "cpr"  grgNemesis/scenario-cpr})
 
 (def patches
   "A map of patch names to Garage builds"
diff --git a/script/jepsen.garage/src/jepsen/garage/nemesis.clj b/script/jepsen.garage/src/jepsen/garage/nemesis.clj
index e64bcaf1..07083038 100644
--- a/script/jepsen.garage/src/jepsen/garage/nemesis.clj
+++ b/script/jepsen.garage/src/jepsen/garage/nemesis.clj
@@ -76,30 +76,24 @@
 (defn scenario-cp
   "Clock scramble + partition scenario"
   [opts]
-  {:generator        (cycle [(gen/sleep 5)
-                             {:type :info, :f :partition-start}
-                             (gen/sleep 5)
-                             {:type :info, :f :clock-scramble}
-                             (gen/sleep 5)
-                             {:type :info, :f :partition-stop}
-                             (gen/sleep 5)
-                             {:type :info, :f :clock-scramble}])
+  {:generator        (->>
+                       (gen/mix [{:type :info, :f :clock-scramble}
+                                 {:type :info, :f :partition-stop}
+                                 {:type :info, :f :partition-start}])
+                       (gen/stagger 3))
    :final-generator  (gen/once {:type :info, :f :partition-stop})
    :nemesis          (nemesis/compose
-                       {{:partition-start :start
-                         :partition-stop :stop} (nemesis/partition-random-halves)
-                        {:clock-scramble :scramble} (nemesis/clock-scrambler 20.0)})})
+                       {{:clock-scramble :scramble} (nemesis/clock-scrambler 20.0)
+                        {:partition-start :start
+                         :partition-stop :stop} (nemesis/partition-random-halves)})})
 
 (defn scenario-r
   "Cluster reconfiguration scenario"
   [opts]
-  {:generator        (cycle [(gen/sleep 5)
-                             {:type :info, :f :reconfigure-start}
-                             (gen/sleep 5)
-                             {:type :info, :f :reconfigure-start}
-                             (gen/sleep 5)
-                             {:type :info, :f :reconfigure-stop}])
-   :final-generator  (gen/once {:type :info, :f :reconfigure-stop})
+  {:generator        (->>
+                       (gen/mix [{:type :info, :f :reconfigure-start}
+                                 {:type :info, :f :reconfigure-stop}])
+                       (gen/stagger 3))
    :nemesis          (nemesis/compose
                        {{:reconfigure-start :start
                          :reconfigure-stop :stop} (reconfigure-subset 3)})})
@@ -107,19 +101,33 @@
 (defn scenario-pr
   "Partition + cluster reconfiguration scenario"
   [opts]
-  {:generator        (cycle [(gen/sleep 3)
-                             {:type :info, :f :reconfigure-start}
-                             (gen/sleep 3)
-                             {:type :info, :f :partition-start}
-                             (gen/sleep 3)
-                             {:type :info, :f :reconfigure-start}
-                             (gen/sleep 3)
-                             {:type :info, :f :partition-stop}
-                             (gen/sleep 3)
-                             {:type :info, :f :reconfigure-stop}])
+  {:generator        (->>
+                       (gen/mix [{:type :info, :f :partition-start}
+                                 {:type :info, :f :partition-stop}
+                                 {:type :info, :f :reconfigure-start}
+                                 {:type :info, :f :reconfigure-stop}])
+                       (gen/stagger 3))
    :final-generator  (gen/once {:type :info, :f :partition-stop})
    :nemesis          (nemesis/compose
                        {{:partition-start :start
                          :partition-stop :stop} (nemesis/partition-random-halves)
                         {:reconfigure-start :start
                          :reconfigure-stop :stop} (reconfigure-subset 3)})})
+
+(defn scenario-cpr
+  "Clock scramble + partition + cluster reconfiguration scenario"
+  [opts]
+  {:generator        (->>
+                       (gen/mix [{:type :info, :f :clock-scramble}
+                                 {:type :info, :f :partition-start}
+                                 {:type :info, :f :partition-stop}
+                                 {:type :info, :f :reconfigure-start}
+                                 {:type :info, :f :reconfigure-stop}])
+                       (gen/stagger 3))
+   :final-generator  (gen/once {:type :info, :f :partition-stop})
+   :nemesis          (nemesis/compose
+                       {{:clock-scramble :scramble} (nemesis/clock-scrambler 20.0)
+                        {:partition-start :start
+                         :partition-stop :stop} (nemesis/partition-random-halves)
+                        {:reconfigure-start :start
+                         :reconfigure-stop :stop} (reconfigure-subset 3)})})
-- 
cgit v1.2.3