Skip to content

Commit 603d3ba

Browse files
author
Saied Kazemi
authored
Use tini to reap orphan child process (#112)
This commit uses tini to start traceroute-caller in order to reap its orphaned child processes. Also, for local debugging via docker-compose, this commit uses the same parameters as are specified in k8s/daemonsets/templates.jsonnet. The changes were tested locally via docker-compose, making sure that there are no orphan processes after traceroute-caller runs scamper.
1 parent 4ccb2c2 commit 603d3ba

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ FROM ubuntu:20.04
4949
# Install all the packages we need and then remove the apt-get lists.
5050
# iproute2 gives us ss
5151
RUN apt-get update && \
52-
apt-get install -y iproute2 && \
52+
apt-get install -y iproute2 tini && \
5353
apt-get clean && \
5454
rm -rf /var/lib/apt/lists/*
5555

@@ -73,4 +73,4 @@ RUN which sc_warts2json
7373
RUN which ss
7474

7575
WORKDIR /
76-
ENTRYPOINT ["/traceroute-caller"]
76+
ENTRYPOINT ["tini", "--", "/traceroute-caller"]

docker-compose.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ services:
6363
- -outputPath=/local/traceroute
6464
- -poll=false
6565
- -tcpinfo.eventsocket=/local/tcpevents.sock
66-
- -tracetool=scamper-daemon
67-
- -scamper.timeout=3600s
68-
- -scamper.tracelb-ptr=false
69-
- -scamper.tracelb-W=30
70-
- -IPCacheTimeout=600s
71-
- -IPCacheUpdatePeriod=60s
66+
- -tracetool=scamper
67+
- -IPCacheTimeout=10m
68+
- -IPCacheUpdatePeriod=1m
69+
- -scamper.timeout=30m
70+
- -scamper.tracelb-W=15
71+
#- -scamper.tracelb-ptr=false

0 commit comments

Comments
 (0)