Fix Nginx Startup and Size Benchmarks.
Changes in Nginx Benchmarks in network_tests also affect Startup/Size Nginx Benchmarks. Make sure the commands line up. PiperOrigin-RevId: 333543697
This commit is contained in:
parent
0a7075f38a
commit
c3fc69022a
|
@ -9,3 +9,4 @@ RUN mkdir -p /local && \
|
||||||
RUN touch /local/index.html
|
RUN touch /local/index.html
|
||||||
|
|
||||||
COPY ./nginx.conf /etc/nginx/nginx.conf
|
COPY ./nginx.conf /etc/nginx/nginx.conf
|
||||||
|
COPY ./nginx_gofer.conf /etc/nginx/nginx_gofer.conf
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
user nginx;
|
||||||
|
worker_processes 1;
|
||||||
|
daemon off;
|
||||||
|
|
||||||
|
error_log /var/log/nginx/error.log warn;
|
||||||
|
pid /var/run/nginx.pid;
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
http {
|
||||||
|
server {
|
||||||
|
location / {
|
||||||
|
root /local;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -105,6 +105,7 @@ func BenchmarkSizeNginx(b *testing.B) {
|
||||||
machine: machine,
|
machine: machine,
|
||||||
port: port,
|
port: port,
|
||||||
runOpts: runOpts,
|
runOpts: runOpts,
|
||||||
|
cmd: []string{"nginx", "-c", "/etc/nginx/nginx_gofer.conf"},
|
||||||
})
|
})
|
||||||
defer cleanUpContainers(ctx, servers)
|
defer cleanUpContainers(ctx, servers)
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@ func BenchmarkStartupNginx(b *testing.B) {
|
||||||
machine: machine,
|
machine: machine,
|
||||||
runOpts: runOpts,
|
runOpts: runOpts,
|
||||||
port: 80,
|
port: 80,
|
||||||
|
cmd: []string{"nginx", "-c", "/etc/nginx/nginx_gofer.conf"},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,8 +124,6 @@ func redisInstance(ctx context.Context, b *testing.B, machine harness.Machine) (
|
||||||
// runServerWorkload runs a server workload defined by 'runOpts' and 'cmd'.
|
// runServerWorkload runs a server workload defined by 'runOpts' and 'cmd'.
|
||||||
// 'clientMachine' is used to connect to the server on 'serverMachine'.
|
// 'clientMachine' is used to connect to the server on 'serverMachine'.
|
||||||
func runServerWorkload(ctx context.Context, b *testing.B, args serverArgs) {
|
func runServerWorkload(ctx context.Context, b *testing.B, args serverArgs) {
|
||||||
b.Helper()
|
|
||||||
|
|
||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
if err := func() error {
|
if err := func() error {
|
||||||
|
|
|
@ -36,50 +36,63 @@ var nginxDocs = map[string]string{
|
||||||
func BenchmarkNginxConcurrency(b *testing.B) {
|
func BenchmarkNginxConcurrency(b *testing.B) {
|
||||||
concurrency := []int{1, 25, 100, 1000}
|
concurrency := []int{1, 25, 100, 1000}
|
||||||
for _, c := range concurrency {
|
for _, c := range concurrency {
|
||||||
b.Run(fmt.Sprintf("%d", c), func(b *testing.B) {
|
for _, tmpfs := range []bool{true, false} {
|
||||||
hey := &tools.Hey{
|
fs := "Gofer"
|
||||||
Requests: c * b.N,
|
if tmpfs {
|
||||||
Concurrency: c,
|
fs = "Tmpfs"
|
||||||
Doc: nginxDocs["10kb"], // see Dockerfile '//images/benchmarks/nginx' and httpd_test.
|
|
||||||
}
|
}
|
||||||
runNginx(b, hey, false /* reverse */)
|
name := fmt.Sprintf("%d_%s", c, fs)
|
||||||
})
|
b.Run(name, func(b *testing.B) {
|
||||||
|
hey := &tools.Hey{
|
||||||
|
Requests: c * b.N,
|
||||||
|
Concurrency: c,
|
||||||
|
Doc: nginxDocs["10kb"], // see Dockerfile '//images/benchmarks/nginx' and httpd_test.
|
||||||
|
}
|
||||||
|
runNginx(b, hey, false /* reverse */, tmpfs /* tmpfs */)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// BenchmarkNginxDocSize iterates over different sized payloads, testing how
|
// BenchmarkNginxDocSize iterates over different sized payloads, testing how
|
||||||
// well the runtime handles sending different payload sizes.
|
// well the runtime handles sending different payload sizes.
|
||||||
func BenchmarkNginxDocSize(b *testing.B) {
|
func BenchmarkNginxDocSize(b *testing.B) {
|
||||||
benchmarkHttpdDocSize(b, false /* reverse */)
|
benchmarkNginxDocSize(b, false /* reverse */, true /* tmpfs */)
|
||||||
|
benchmarkNginxDocSize(b, false /* reverse */, false /* tmpfs */)
|
||||||
}
|
}
|
||||||
|
|
||||||
// BenchmarkReverseNginxDocSize iterates over different sized payloads, testing
|
// BenchmarkReverseNginxDocSize iterates over different sized payloads, testing
|
||||||
// how well the runtime handles receiving different payload sizes.
|
// how well the runtime handles receiving different payload sizes.
|
||||||
func BenchmarkReverseNginxDocSize(b *testing.B) {
|
func BenchmarkReverseNginxDocSize(b *testing.B) {
|
||||||
benchmarkHttpdDocSize(b, true /* reverse */)
|
benchmarkNginxDocSize(b, true /* reverse */, true /* tmpfs */)
|
||||||
}
|
}
|
||||||
|
|
||||||
// benchmarkNginxDocSize iterates through all doc sizes, running subbenchmarks
|
// benchmarkNginxDocSize iterates through all doc sizes, running subbenchmarks
|
||||||
// for each size.
|
// for each size.
|
||||||
func benchmarkNginxDocSize(b *testing.B, reverse bool) {
|
func benchmarkNginxDocSize(b *testing.B, reverse, tmpfs bool) {
|
||||||
b.Helper()
|
|
||||||
for name, filename := range nginxDocs {
|
for name, filename := range nginxDocs {
|
||||||
concurrency := []int{1, 25, 50, 100, 1000}
|
concurrency := []int{1, 25, 50, 100, 1000}
|
||||||
for _, c := range concurrency {
|
for _, c := range concurrency {
|
||||||
b.Run(fmt.Sprintf("%s_%d", name, c), func(b *testing.B) {
|
fs := "Gofer"
|
||||||
|
if tmpfs {
|
||||||
|
fs = "Tmpfs"
|
||||||
|
}
|
||||||
|
benchName := fmt.Sprintf("%s_%d_%s", name, c, fs)
|
||||||
|
b.Run(benchName, func(b *testing.B) {
|
||||||
hey := &tools.Hey{
|
hey := &tools.Hey{
|
||||||
Requests: c * b.N,
|
Requests: c * b.N,
|
||||||
Concurrency: c,
|
Concurrency: c,
|
||||||
Doc: filename,
|
Doc: filename,
|
||||||
}
|
}
|
||||||
runNginx(b, hey, reverse)
|
runNginx(b, hey, reverse, tmpfs)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// runNginx configures the static serving methods to run httpd.
|
// runNginx configures the static serving methods to run httpd.
|
||||||
func runNginx(b *testing.B, hey *tools.Hey, reverse bool) {
|
func runNginx(b *testing.B, hey *tools.Hey, reverse, tmpfs bool) {
|
||||||
// nginx runs on port 80.
|
// nginx runs on port 80.
|
||||||
port := 80
|
port := 80
|
||||||
nginxRunOpts := dockerutil.RunOpts{
|
nginxRunOpts := dockerutil.RunOpts{
|
||||||
|
@ -87,7 +100,11 @@ func runNginx(b *testing.B, hey *tools.Hey, reverse bool) {
|
||||||
Ports: []int{port},
|
Ports: []int{port},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nginxCmd := []string{"nginx", "-c", "/etc/nginx/nginx_gofer.conf"}
|
||||||
|
if tmpfs {
|
||||||
|
nginxCmd = []string{"sh", "-c", "mkdir -p /tmp/html && cp -a /local/* /tmp/html && nginx -c /etc/nginx/nginx.conf"}
|
||||||
|
}
|
||||||
|
|
||||||
// Command copies nginxDocs to tmpfs serving directory and runs nginx.
|
// Command copies nginxDocs to tmpfs serving directory and runs nginx.
|
||||||
nginxCmd := []string{"sh", "-c", "mkdir -p /tmp/html && cp -a /local/* /tmp/html && nginx"}
|
|
||||||
runStaticServer(b, nginxRunOpts, nginxCmd, port, hey, reverse)
|
runStaticServer(b, nginxRunOpts, nginxCmd, port, hey, reverse)
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,6 @@ import (
|
||||||
|
|
||||||
// runStaticServer runs static serving workloads (httpd, nginx).
|
// runStaticServer runs static serving workloads (httpd, nginx).
|
||||||
func runStaticServer(b *testing.B, serverOpts dockerutil.RunOpts, serverCmd []string, port int, hey *tools.Hey, reverse bool) {
|
func runStaticServer(b *testing.B, serverOpts dockerutil.RunOpts, serverCmd []string, port int, hey *tools.Hey, reverse bool) {
|
||||||
b.Helper()
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
// Get two machines: a client and server.
|
// Get two machines: a client and server.
|
||||||
|
|
Loading…
Reference in New Issue