Use dorun (map .. instead of unused-ret-val (vmap ... and util/sp…

…y instead of dprint.
jepsen-io · Apr 22, 2020 · f34b363 · f34b363
1 parent 6c5a32f
commit f34b363
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/jepsen/src/jepsen/generator/interpreter.clj b/jepsen/src/jepsen/generator/interpreter.clj
@@ -231,7 +231,7 @@
                     (do (doseq [[thread queue] invocations]
                           (.put ^ArrayBlockingQueue queue {:type :exit}))
                         ; Wait for exit
-                        (util/discard-ret-val (mapv (comp deref :future) workers))
+                        (dorun (map (comp deref :future) workers))
                         (persistent! history)))
 
               ; Nothing we can do right now. Let's try to complete something.
@@ -268,7 +268,7 @@
         ; We only try to cancel each worker *once*--if we try to cancel
         ; multiple times, we might interrupt a worker while it's in the finally
         ; block, cleaning up its client.
-        (util/discard-ret-val (mapv (comp future-cancel :future) workers))
+        (dorun (map (comp future-cancel :future) workers))
         ; If for some reason *that* doesn't work, we ask them all to exit via
         ; their queue.
         (loop [unfinished workers]

diff --git a/jepsen/src/jepsen/os/centos.clj b/jepsen/src/jepsen/os/centos.clj
@@ -2,7 +2,7 @@
   "Common tasks for CentOS boxes."
   (:require [clojure.set :as set]
             [clojure.tools.logging :refer [info]]
-            [jepsen.util :refer [meh]]
+            [jepsen.util :as u]
             [jepsen.os :as os]
             [jepsen.control :as c]
             [jepsen.control.util :as cu]
@@ -43,10 +43,6 @@
        (catch Exception e
          (update!))))
 
-(defmacro dprint [x]
-  `((fn [x#] ; XXX: 'Could not resolve var: do
-      x#) ~x))
-
 (defn installed
   "Given a list of centos packages (strings, symbols, keywords, etc), returns
   the set of packages which are installed, as strings."
@@ -58,7 +54,7 @@
          (map (comp second (partial re-find #"(.*)\.[^\-]+")))
          set
          ((partial clojure.set/intersection pkgs))
-         dprint)))
+         u/spy)))
 
 (defn uninstall!
   "Removes a package or packages."
@@ -155,7 +151,7 @@
 
     (if (not= true (installed-start-stop-daemon?)) (install-start-stop-daemon!) (info "start-stop-daemon already installed"))
 
-    (meh (net/heal! (:net test) test)))
+    (u/meh (net/heal! (:net test) test)))
 
   (teardown! [_ test node]))