Add topic read/write test

src/jable/cli.clj

@@ -12,15 +12,35 @@
 ; this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (ns jable.cli
-  (:require [jepsen.cli :as cli]
-            [jepsen.tests :as tests]
+  (:require [jepsen [cli :as cli]
+                    [tests :as tests]
+                    [checker :as checker]
+                    [generator :as gen]
+                    [nemesis :as nemesis]]
             [jepsen.os.debian :as debian]
+            [knossos.model :as model]
             [jable.client :as client]
-            [jepsen.generator :as gen]
-            [jable.db :as db]))
+            [jable.db :as db])
+  (:import (knossos.model Model)))
 
 (defn r   [_ _] {:type :invoke, :f :read-topic, :value nil})
-(defn w   [_ _] {:type :invoke, :f :write-topic, :value (rand-int 5)})
+(defn w   [_ _] {:type :invoke, :f :write-topic, :value (str (rand-int 5))})
+
+(defrecord Channel [value]
+  Model
+  (step [c op]
+    (case (:f op)
+      :write-topic (Channel. (:value op))
+      :read-topic  (if (= value (:value op))
+                     c
+                     (model/inconsistent
+                       (str (pr-str value) "≠" (pr-str (:value op)))))))
+
+  Object
+  (toString [r] (pr-str value)))
+
+(defn channel []
+  (Channel. nil))
 
 (defn sable-test
   "Given an options map from the command line runner (e.g. :nodes, :ssh,
@@ -33,7 +53,11 @@
           :os   debian/os
           :db   (db/sable (:sable-bin opts) (:nodes opts))
           :client (client/jable.client.Client. nil nil nil)
-          :generator       (->> r
+          :nemesis         (nemesis/partition-random-halves)
+          :checker         (checker/linearizable
+                             {:model     (channel)
+                              :algorithm :linear})
+          :generator       (->> (gen/mix [r w])
                                 (gen/stagger 1)
                                 (gen/nemesis nil)
                                 (gen/time-limit 15))}))

src/jable/client.clj

@@ -159,20 +159,53 @@
                        :reader (io/reader socket)
                        :writer (io/writer socket))]
         (send-commands this [{:cmd "CAP" :params ["LS" "302"]}
-                             {:cmd "CAP" :params ["REQ" "labeled-response batch"]}
-                             {:cmd "NICK" :params [(str "test-" node)]}
-                             {:cmd "USER" :params [(str "test-" node) "*" "*" (str "test " node)]}
+                             {:cmd "CAP" :params ["REQ" "labeled-response batch draft/channel-rename"]}
+                             {:cmd "NICK" :params [(str "test-" node "-" (.getLocalPort socket))]}
+                             {:cmd "USER" :params [(str "test-" node) "*" "*" (str "test " node " port " (.getLocalPort socket))]}
                              {:tags {"label" "cap-end"} :cmd "CAP" :params ["END"]}])
         (read-response this "cap-end")  ; block until end of registration
+        (info "registered")
         (send-command this {:tags {"label" "join-#chan"} :cmd "JOIN" :params ["#chan"]})
         (read-response this "join-#chan")  ; block until joined
+        (info "joined")
+        (Thread/sleep 1000)
+        (send-command this {:tags {"label" "names"}:cmd "NAMES" :params ["#chan"]})
         (send-command this {:tags {"label" "mode-topic"} :cmd "MODE" :params ["#chan" "-t"]})
         (read-response this "mode-topic")  ; block until mode is set
+        (info "set mode -t")
+        (send-command this {:tags {"label" "get-mode" } :cmd "MODE" :params ["#chan"]})
+        (read-response this "get-mode")  ; block
+        (info "read mode")
         this)))
 
   (setup! [this test])
 
-  (invoke! [_ test op])
+  (invoke! [this test op]
+    (case (:f op)
+        :read-topic (do
+                      (send-command this {:tags {"label" "read-topic"}
+                                          :cmd "TOPIC"
+                                          :params ["#chan"]})
+                      (let [[cmd1 & cmds] (read-response this "read-topic")]
+                        (case (:cmd cmd1)
+                          ; RPL_NOTOPIC
+                          "331" (assoc op :type :ok, :value nil)
+                          "BATCH" (let [[topic-cmd topicwhotime-cmd batch-close] cmds]
+                                    ; RPL_TOPIC
+                                    (assert (= (:cmd topic-cmd) "332") (str "expected RPL_TOPIC: " topic-cmd))
+                                    ; RPL_TOPICWHOTIME
+                                    (assert (= (:cmd topicwhotime-cmd) "333") (str "expected RPL_TOPICWHOTIME: " topicwhotime-cmd))
+                                    (assert (= (:cmd batch-close) "BATCH") "topic batch close cmd")
+                                    (let [[nick chan topic] (:params topic-cmd)]
+                                      (assoc op :type :ok, :value topic))))))
+        :write-topic (do
+                       (send-command this {:tags {"label" "write-topic"}
+                                           :cmd "TOPIC"
+                                           :params ["#chan" (:value op)]})
+                       (let [[cmd] (read-response this "write-topic")]
+                         (assert (= (:cmd cmd) "TOPIC") (str "unexpected TOPIC reply: " cmd))
+                         (let [[chan topic] (:params cmd)]
+                           (assoc op :type :ok, :value topic))))))
 
   (teardown! [this test])
 

src/jable/db.clj

@@ -96,7 +96,7 @@
 (defn server_conf
   [nodes node]
   {
-    :server_id (.indexOf nodes node),
+    :server_id (+ 1 (.indexOf nodes node)),
     :server_name node,
     :management {
       :address "[::]:8888",