From 98f9527c04dfc4af242080b5ea29e6da09290098 Mon Sep 17 00:00:00 2001
From: Zach Koopmans <zkoopmans@google.com>
Date: Thu, 30 Jul 2020 21:15:34 -0700
Subject: Port nginx and move parsers to own package.

This change:
- Ports the nginx benchmark.
- Switches the Httpd benchmark to use 'hey' as a client.
- Moves all parsers to their own package 'tools'.

Parsers are moved to their own package because 1) parsing output of a command
is often dependent on the format of the command (e.g. 'fio --json'), 2) to
enable easier reuse, and 3) clean up and simplify actual running benchmarks
(no TestParser functions and ugly sample output in benchmark files).

PiperOrigin-RevId: 324144165
---
 test/benchmarks/database/BUILD         |  1 +
 test/benchmarks/database/redis_test.go | 86 +++-------------------------------
 2 files changed, 7 insertions(+), 80 deletions(-)

(limited to 'test/benchmarks/database')

diff --git a/test/benchmarks/database/BUILD b/test/benchmarks/database/BUILD
index 5e33465cd..572db665f 100644
--- a/test/benchmarks/database/BUILD
+++ b/test/benchmarks/database/BUILD
@@ -24,5 +24,6 @@ go_test(
     deps = [
         "//pkg/test/dockerutil",
         "//test/benchmarks/harness",
+        "//test/benchmarks/tools",
     ],
 )
diff --git a/test/benchmarks/database/redis_test.go b/test/benchmarks/database/redis_test.go
index 6d39f4d66..394fce820 100644
--- a/test/benchmarks/database/redis_test.go
+++ b/test/benchmarks/database/redis_test.go
@@ -16,15 +16,12 @@ package database
 
 import (
 	"context"
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
 	"testing"
 	"time"
 
 	"gvisor.dev/gvisor/pkg/test/dockerutil"
 	"gvisor.dev/gvisor/test/benchmarks/harness"
+	"gvisor.dev/gvisor/test/benchmarks/tools"
 )
 
 // All possible operations from redis. Note: "ping" will
@@ -99,16 +96,10 @@ func BenchmarkRedis(b *testing.B) {
 				b.Fatalf("failed to start redis with: %v", err)
 			}
 
-			// runs redis benchmark -t operation for 100K requests against server.
-			cmd := strings.Split(
-				fmt.Sprintf("redis-benchmark --csv -t %s -h %s -p %d", operation, ip, serverPort), " ")
-
-			// There is no -t PING_BULK for redis-benchmark, so adjust the command in that case.
-			// Note that "ping" will run both PING_INLINE and PING_BULK.
-			if operation == "PING_BULK" {
-				cmd = strings.Split(
-					fmt.Sprintf("redis-benchmark --csv -t ping -h %s -p %d", ip, serverPort), " ")
+			redis := tools.Redis{
+				Operation: operation,
 			}
+
 			// Reset profiles and timer to begin the measurement.
 			server.RestartProfiles()
 			b.ResetTimer()
@@ -117,81 +108,16 @@ func BenchmarkRedis(b *testing.B) {
 				defer client.CleanUp(ctx)
 				out, err := client.Run(ctx, dockerutil.RunOpts{
 					Image: "benchmarks/redis",
-				}, cmd...)
+				}, redis.MakeCmd(ip, serverPort)...)
 				if err != nil {
 					b.Fatalf("redis-benchmark failed with: %v", err)
 				}
 
 				// Stop time while we parse results.
 				b.StopTimer()
-				result, err := parseOperation(operation, out)
-				if err != nil {
-					b.Fatalf("parsing result %s failed with err: %v", out, err)
-				}
-				b.ReportMetric(result, operation) // operations per second
+				redis.Report(b, out)
 				b.StartTimer()
 			}
 		})
 	}
 }
-
-// parseOperation grabs the metric operations per second from redis-benchmark output.
-func parseOperation(operation, data string) (float64, error) {
-	re := regexp.MustCompile(fmt.Sprintf(`"%s( .*)?","(\d*\.\d*)"`, operation))
-	match := re.FindStringSubmatch(data)
-	// If no match, simply don't add it to the result map.
-	if len(match) < 3 {
-		return 0.0, fmt.Errorf("could not find %s in %s", operation, data)
-	}
-	return strconv.ParseFloat(match[2], 64)
-}
-
-// TestParser tests the parser on sample data.
-func TestParser(t *testing.T) {
-	sampleData := `
-	"PING_INLINE","48661.80"
-	"PING_BULK","50301.81"
-	"SET","48923.68"
-	"GET","49382.71"
-	"INCR","49975.02"
-	"LPUSH","49875.31"
-	"RPUSH","50276.52"
-	"LPOP","50327.12"
-	"RPOP","50556.12"
-	"SADD","49504.95"
-	"HSET","49504.95"
-	"SPOP","50025.02"
-	"LPUSH (needed to benchmark LRANGE)","48875.86"
-	"LRANGE_100 (first 100 elements)","33955.86"
-	"LRANGE_300 (first 300 elements)","16550.81"
-	"LRANGE_500 (first 450 elements)","13653.74"
-	"LRANGE_600 (first 600 elements)","11219.57"
-	"MSET (10 keys)","44682.75"
-	`
-	wants := map[string]float64{
-		"PING_INLINE": 48661.80,
-		"PING_BULK":   50301.81,
-		"SET":         48923.68,
-		"GET":         49382.71,
-		"INCR":        49975.02,
-		"LPUSH":       49875.31,
-		"RPUSH":       50276.52,
-		"LPOP":        50327.12,
-		"RPOP":        50556.12,
-		"SADD":        49504.95,
-		"HSET":        49504.95,
-		"SPOP":        50025.02,
-		"LRANGE_100":  33955.86,
-		"LRANGE_300":  16550.81,
-		"LRANGE_500":  13653.74,
-		"LRANGE_600":  11219.57,
-		"MSET":        44682.75,
-	}
-	for op, want := range wants {
-		if got, err := parseOperation(op, sampleData); err != nil {
-			t.Fatalf("failed to parse %s: %v", op, err)
-		} else if want != got {
-			t.Fatalf("wanted %f for op %s, got %f", want, op, got)
-		}
-	}
-}
-- 
cgit v1.2.3