[GitHub] tillrohrmann closed pull request #6458: [FLINK-9995][tests] Improve tearing down Mesos.

[GitBox <gi...@apache.org>]

tillrohrmann closed pull request #6458: [FLINK-9995][tests] Improve tearing down Mesos.
URL: https://github.com/apache/flink/pull/6458
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-jepsen/src/jepsen/flink/mesos.clj b/flink-jepsen/src/jepsen/flink/mesos.clj
index 74b2c0d957c..fd75991bdf5 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
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services