From efd4bbd5be8fa866c11dbec1c61deed48b01c257 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 24 Aug 2018 22:45:41 +0000 Subject: [PATCH] Create bpf stop file differently Somehow the /proc/pid/root thing is not creating a file that can be seen inside the container any more. --- integration/315_ebpf_restart_test.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/integration/315_ebpf_restart_test.sh b/integration/315_ebpf_restart_test.sh index 6235a6df7..1bd27931a 100755 --- a/integration/315_ebpf_restart_test.sh +++ b/integration/315_ebpf_restart_test.sh @@ -20,8 +20,7 @@ has_container "$HOST1" nginx has_container "$HOST1" client has_connection containers "$HOST1" client nginx -# shellcheck disable=SC2016 -run_on "$HOST1" 'echo stop | sudo tee /proc/$(pidof scope-probe)/root/var/run/scope/debug-bpf' +docker_on "$HOST1" exec weavescope sh -c "echo stop > /var/run/scope/debug-bpf" sleep 5 server_on "$HOST1" "nginx2" @@ -37,8 +36,7 @@ has_connection containers "$HOST1" client2 nginx2 exec 3>&1 assert_raises "docker_on $HOST1 logs weavescope 2>&1 | grep 'ebpf tracker died, restarting it' || (docker_on $HOST1 logs weavescope 2>&3 ; false)" -# shellcheck disable=SC2016 -run_on "$HOST1" 'echo stop | sudo tee /proc/$(pidof scope-probe)/root/var/run/scope/debug-bpf' +docker_on "$HOST1" exec weavescope sh -c "echo stop > /var/run/scope/debug-bpf" sleep 5 server_on "$HOST1" "nginx3"