[flink] branch release-1.6 updated: [FLINK-9995][tests] Improve tearing down Mesos.

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.6 by this push:
     new ea97ef4  [FLINK-9995][tests] Improve tearing down Mesos.
ea97ef4 is described below

commit ea97ef4edea39c00769f2d8e0c4b14d9eb413439
Author: gyao <ga...@data-artisans.com>
AuthorDate: Mon Jul 30 11:05:45 2018 +0200

    [FLINK-9995][tests] Improve tearing down Mesos.
    
    - Clean up logs and Mesos working directory.
    - Kill Mesos processes using grepkill! utility.
---
 flink-jepsen/src/jepsen/flink/mesos.clj | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/flink-jepsen/src/jepsen/flink/mesos.clj b/flink-jepsen/src/jepsen/flink/mesos.clj
index 74b2c0d..fd75991 100644
--- a/flink-jepsen/src/jepsen/flink/mesos.clj
+++ b/flink-jepsen/src/jepsen/flink/mesos.clj
@@ -111,14 +111,20 @@
 (defn stop-master!
   [node]
   (info node "Stopping mesos master")
-  (meh (c/exec :killall :-9 :mesos-master))
-  (meh (c/exec :rm :-rf master-pidfile)))
+  (meh (cu/grepkill! :mesos-master))
+  (meh (c/exec :rm :-rf master-pidfile))
+  (meh (c/exec :rm :-rf
+               (c/lit (str log-dir "/*"))
+               (c/lit (str master-dir "/*")))))
 
 (defn stop-slave!
   [node]
   (info node "Stopping mesos slave")
-  (meh (c/exec :killall :-9 :mesos-slave))
-  (meh (c/exec :rm :-rf slave-pidfile)))
+  (meh (cu/grepkill! :mesos-slave))
+  (meh (c/exec :rm :-rf slave-pidfile))
+  (meh (c/exec :rm :-rf
+               (c/lit (str log-dir "/*"))
+               (c/lit (str slave-dir "/*")))))
 
 ;;; Marathon functions