/go/performance/utils/benchmark_runner: fix tester again

dolthub · Feb 15, 2024 · 63d298c · 63d298c
1 parent da0b4c6
commit 63d298c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 54 deletions.
diff --git a/go/performance/utils/benchmark_runner/run_test.go b/go/performance/utils/benchmark_runner/run_test.go
@@ -147,15 +147,15 @@ func TestDoltgresPostgresSysbenchRunner(t *testing.T) {
 			NewTestConfig("oltp_update_index", nil, false),
 		},
 		Servers: []ServerConfig{
-			//&postgresServerConfigImpl{
-			//	Id:            "test-postgres",
-			//	Host:          "127.0.0.1",
-			//	Version:       "15.5",
-			//	ResultsFormat: CsvFormat,
-			//	ServerExec:    "/usr/lib/postgresql/15/bin/postgres",
-			//	InitExec:      "/usr/lib/postgresql/15/bin/initdb",
-			//	ServerUser:    "root",
-			//},
+			&postgresServerConfigImpl{
+				Id:            "test-postgres",
+				Host:          "127.0.0.1",
+				Version:       "15.5",
+				ResultsFormat: CsvFormat,
+				ServerExec:    "/usr/lib/postgresql/15/bin/postgres",
+				InitExec:      "/usr/lib/postgresql/15/bin/initdb",
+				ServerUser:    "root",
+			},
 			&doltgresServerConfigImpl{
 				Id:            "test-doltgres",
 				Port:          4433,

diff --git a/go/performance/utils/benchmark_runner/sysbench.go b/go/performance/utils/benchmark_runner/sysbench.go
@@ -91,24 +91,13 @@ func (t *sysbenchTesterImpl) outputToResult(output []byte) (*Result, error) {
 }
 
 func (t *sysbenchTesterImpl) prepare(ctx context.Context) error {
-	cmd := exec.CommandContext(ctx, sysbenchCommand, t.test.GetPrepareArgs(t.serverConfig)...)
+	cmd := ExecCommand(ctx, sysbenchCommand, t.test.GetPrepareArgs(t.serverConfig)...)
 	if t.test.GetFromScript() {
 		lp := filepath.Join(t.config.GetScriptDir(), luaPath)
 		cmd.Env = os.Environ()
 		cmd.Env = append(cmd.Env, fmt.Sprintf(luaPathEnvVarTemplate, lp))
 	}
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		panic(err)
-	}
-	//out, err := cmd.Output()
-	//if err != nil {
-	//	fmt.Println(string(out))
-	//	return err
-	//}
-	return nil
+	return cmd.Run()
 }
 
 func (t *sysbenchTesterImpl) run(ctx context.Context) (*Result, error) {
@@ -119,48 +108,34 @@ func (t *sysbenchTesterImpl) run(ctx context.Context) (*Result, error) {
 		cmd.Env = append(cmd.Env, fmt.Sprintf(luaPathEnvVarTemplate, lp))
 	}
 
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
+	out, err := cmd.Output()
 	if err != nil {
-		panic(err)
+		fmt.Print(string(out))
+		return nil, err
 	}
-	return nil, nil
-	//out, err := cmd.Output()
-	//if err != nil {
-	//	fmt.Print(string(out))
-	//	return nil, err
-	//}
-
-	//if Debug == true {
-	//	fmt.Print(string(out))
-	//}
-	//
-	//rs, err := t.outputToResult(out)
-	//if err != nil {
-	//	return nil, err
-	//}
-
-	//rs.Stamp(t.stampFunc)
-	//
-	//return rs, nil
+
+	if Debug == true {
+		fmt.Print(string(out))
+	}
+
+	rs, err := t.outputToResult(out)
+	if err != nil {
+		return nil, err
+	}
+
+	rs.Stamp(t.stampFunc)
+
+	return rs, nil
 }
 
 func (t *sysbenchTesterImpl) cleanup(ctx context.Context) error {
-	cmd := exec.CommandContext(ctx, sysbenchCommand, t.test.GetCleanupArgs(t.serverConfig)...)
+	cmd := ExecCommand(ctx, sysbenchCommand, t.test.GetCleanupArgs(t.serverConfig)...)
 	if t.test.GetFromScript() {
 		lp := filepath.Join(t.config.GetScriptDir(), luaPath)
 		cmd.Env = os.Environ()
 		cmd.Env = append(cmd.Env, fmt.Sprintf(luaPathEnvVarTemplate, lp))
 	}
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		panic(err)
-	}
-	return nil
-	//return cmd.Run()
+	return cmd.Run()
 }
 
 func (t *sysbenchTesterImpl) Test(ctx context.Context) (*Result, error) {