Merge pull request #7367 from dolthub/db/user

[no-release-notes] update sysbench runner to create and init data dir for mysql

.github/scripts/performance-benchmarking/get-mysql-dolt-job-json.sh

@@ -89,6 +89,7 @@ echo '
               "--useDoltHubLuaScriptsRepo",
               "--output='$format'",
               "--mysql-exec=/usr/sbin/mysqld",
+              "--mysql-socket=/home/tester/.mysql/mysqld.sock",
               "--mysql-protocol=unix",
               "--from-server='$fromServer'",
               "--from-version='$fromVersion'",

go/performance/continuous_integration/config.json

@@ -14,7 +14,9 @@
       "Version": "8.0.22",
       "ResultsFormat": "csv",
       "ServerExec": "/usr/sbin/mysqld",
-      "ConnectionProtocol": "unix"
+      "ConnectionProtocol": "unix",
+      "ServerUser": "root",
+      "SkipLogBin": true
     }
   ],
   "ScriptDir":"/sysbench-lua-scripts",

go/performance/continuous_integration/tpcc-config.json

@@ -13,7 +13,9 @@
       "Version": "8.0.22",
       "ResultsFormat": "csv",
       "ServerExec": "/usr/sbin/mysqld",
-      "ConnectionProtocol": "unix"
+      "ConnectionProtocol": "unix",
+      "ServerUser": "root",
+      "SkipLogBin": true
     }
   ],
   "ScriptDir":"/sysbench-tpcc",

go/performance/utils/sysbench_runner/config.go

@@ -64,7 +64,7 @@ var defaultSysbenchParams = []string{
 }
 
 var defaultDoltServerParams = []string{"sql-server"}
-var defaultMysqlServerParams = []string{"--user=mysql"}
+var defaultMysqlServerParams = []string{}
 var defaultDoltgresServerParams = []string{}
 var defaultPostgresServerParams = []string{}
 
@@ -269,6 +269,12 @@ type ServerConfig struct {
 	// InitExec is the path to the server init db executable
 	InitExec string
 
+	// ServerUser is the user account that should start the server
+	ServerUser string
+
+	// SkipLogBin will skip bin logging
+	SkipLogBin bool
+
 	// ServerArgs are the args used to start a server
 	ServerArgs []string
 
@@ -295,6 +301,12 @@ func (sc *ServerConfig) GetServerArgs() []string {
 		defaultParams = defaultDoltServerParams
 	} else if sc.Server == MySql {
 		defaultParams = defaultMysqlServerParams
+		if sc.ServerUser != "" {
+			params = append(params, fmt.Sprintf("--user=%s", sc.ServerUser))
+		}
+		if sc.SkipLogBin {
+			params = append(params, "--skip-log-bin")
+		}
 	} else if sc.Server == Doltgres {
 		defaultParams = defaultDoltgresServerParams
 	} else if sc.Server == Postgres {
@@ -308,6 +320,7 @@ func (sc *ServerConfig) GetServerArgs() []string {
 	if sc.Port != 0 {
 		params = append(params, fmt.Sprintf("--port=%d", sc.Port))
 	}
+
 	params = append(params, sc.ServerArgs...)
 	return params
 }

go/performance/utils/sysbench_runner/mysql.go

@@ -41,15 +41,32 @@ type MysqlConfig struct {
 func BenchmarkMysql(ctx context.Context, config *Config, serverConfig *ServerConfig) (Results, error) {
 	withKeyCtx, cancel := context.WithCancel(ctx)
 
+	var serverDir string
+	defer func() {
+		if serverDir != "" {
+			os.RemoveAll(serverDir)
+		}
+	}()
+
 	var localServer bool
 	var gServer *errgroup.Group
 	var serverCtx context.Context
 	var server *exec.Cmd
+	var err error
 	if serverConfig.Host == defaultHost {
 		log.Println("Launching the default server")
 		localServer = true
+
+		serverDir, err = initMysqlDataDir(ctx, serverConfig)
+		if err != nil {
+			cancel()
+			return nil, err
+		}
+
 		gServer, serverCtx = errgroup.WithContext(withKeyCtx)
 		serverParams := serverConfig.GetServerArgs()
+		serverParams = append(serverParams, fmt.Sprintf("--datadir=%s", serverDir))
+
 		server = getMysqlServer(serverCtx, serverConfig, serverParams)
 
 		// launch the mysql server
@@ -129,6 +146,22 @@ func getMysqlServer(ctx context.Context, config *ServerConfig, params []string)
 	return ExecCommand(ctx, config.ServerExec, params...)
 }
 
+// initMysqlDataDir initializes a mysql data dir and returns the path
+func initMysqlDataDir(ctx context.Context, config *ServerConfig) (string, error) {
+	serverDir, err := createServerDir(dbName)
+	if err != nil {
+		return "", err
+	}
+
+	msInit := ExecCommand(ctx, config.ServerExec, "--initialize-insecure", fmt.Sprintf("--datadir=%s", serverDir))
+	err = msInit.Run()
+	if err != nil {
+		return "", err
+	}
+
+	return serverDir, nil
+}
+
 func SetupDB(ctx context.Context, mConfig MysqlConfig, databaseName string) (err error) {
 	dsn, err := FormatDsn(mConfig)
 	if err != nil {
@@ -190,6 +223,7 @@ func FormatDsn(mConfig MysqlConfig) (string, error) {
 	} else {
 		socketPath = defaultMysqlSocket
 	}
+
 	if mConfig.ConnectionProtocol == tcpProtocol {
 		return fmt.Sprintf("root@tcp(%s:%d)/", mConfig.Host, mConfig.Port), nil
 	} else if mConfig.ConnectionProtocol == unixProtocol {

go/performance/utils/sysbench_runner/postgres.go

@@ -58,7 +58,7 @@ func BenchmarkPostgres(ctx context.Context, config *Config, serverConfig *Server
 		log.Println("Launching the default server")
 		localServer = true
 
-		serverDir, err = initPostgresDb(ctx, serverConfig)
+		serverDir, err = initPostgresDataDir(ctx, serverConfig)
 		if err != nil {
 			cancel()
 			return nil, err
@@ -142,8 +142,8 @@ func BenchmarkPostgres(ctx context.Context, config *Config, serverConfig *Server
 	return results, nil
 }
 
-// initPostgresDb initializes a dolt repo and returns the repo path
-func initPostgresDb(ctx context.Context, config *ServerConfig) (string, error) {
+// initPostgresDataDir initializes a postgres data dir and returns the path
+func initPostgresDataDir(ctx context.Context, config *ServerConfig) (string, error) {
 	serverDir, err := createServerDir(dbName)
 	if err != nil {
 		return "", err