[flink] branch master updated: [FLINK-10465][tests] Do not stop sshd if it is supervised by runit.

[ga...@apache.org]

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

gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 02d1057  [FLINK-10465][tests] Do not stop sshd if it is supervised by runit.
02d1057 is described below

commit 02d1057794de9f4868886c08f1abeeb7fd31f9cf
Author: gyao <ga...@data-artisans.com>
AuthorDate: Sat Sep 29 14:35:29 2018 +0200

    [FLINK-10465][tests] Do not stop sshd if it is supervised by runit.
---
 flink-jepsen/src/jepsen/flink/utils.clj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flink-jepsen/src/jepsen/flink/utils.clj b/flink-jepsen/src/jepsen/flink/utils.clj
index 50d0075..5f96f8c0 100644
--- a/flink-jepsen/src/jepsen/flink/utils.clj
+++ b/flink-jepsen/src/jepsen/flink/utils.clj
@@ -86,4 +86,7 @@
   []
   (info "Stop all supervised services.")
   (c/su
-    (c/exec :rm :-f (c/lit (str "/etc/service/*")))))
+    ;; HACK:
+    ;; Remove all symlinks in /etc/service except sshd.
+    ;; This is only relevant when tests are run in Docker because there sshd is started using runit.
+    (c/exec :find (c/lit (str "/etc/service -maxdepth 1 -type l ! -name 'sshd' -delete")))))