- avoid setting LD_PRELOAD for container
- save nginx error log to shared volume
- reduce test run time to 10s
- add vcl and ldp debug env variables to docker file. Default to
disabled.
Type: test
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I401ac74e7c0ebe87befedb44150b04f773f244ea
FROM ubuntu:${UBUNTU_VERSION}
RUN apt-get update \
FROM ubuntu:${UBUNTU_VERSION}
RUN apt-get update \
- && apt-get install -y nginx \
+ && apt-get install -y nginx gdb less \
&& rm -rf /var/lib/apt/lists/*
COPY vpp-data/lib/* /usr/lib/
COPY resources/nginx/vcl.conf /vcl.conf
COPY resources/nginx/nginx.conf /nginx.conf
&& rm -rf /var/lib/apt/lists/*
COPY vpp-data/lib/* /usr/lib/
COPY resources/nginx/vcl.conf /vcl.conf
COPY resources/nginx/nginx.conf /nginx.conf
+COPY script/nginx_ldp.sh /usr/bin/nginx_ldp.sh
-ENV LD_PRELOAD=/usr/lib/libvcl_ldpreload.so
+ENV LDP=/usr/lib/libvcl_ldpreload.so
+ENV LDP_DEBUG=0
+ENV VCL_DEBUG=0
+ENV LDP_SID_BIT=8
-ENTRYPOINT ["nginx", "-c", "/nginx.conf"]
+ENTRYPOINT ["nginx_ldp.sh", "-c", "/nginx.conf"]
- testCommand := "wrk -c 20 -t 10 -d 40 http://" + proxyAddress + ":80" + path
+ testCommand := "wrk -c 20 -t 10 -d 10 http://" + proxyAddress + ":80" + path
s.log(testCommand)
o, _ := exechelper.Output(testCommand)
s.log(string(o))
s.log(testCommand)
o, _ := exechelper.Output(testCommand)
s.log(string(o))
worker_processes 4;
worker_rlimit_nofile 102400;
daemon off;
worker_processes 4;
worker_rlimit_nofile 102400;
daemon off;
+error_log /tmp/nginx/error.log;
+
events {
use epoll;
worker_connections 102400;
events {
use epoll;
worker_connections 102400;
--- /dev/null
+#!/usr/bin/env bash
+
+LD_PRELOAD=$LDP nginx $@ 2>&1 > /proc/1/fd/1