*: force_init_stats doesn't block http api's startup (#50853) (#51039)

close #50854

br/pkg/mock/mock_cluster.go

@@ -100,7 +100,7 @@ func (mock *Cluster) Start() error {
 	}
 	mock.Server = svr
 	go func() {
-		if err1 := svr.Run(); err1 != nil {
+		if err1 := svr.Run(nil); err1 != nil {
 			panic(err1)
 		}
 	}()

server/extract_test.go

@@ -53,7 +53,7 @@ func TestExtractHandler(t *testing.T) {
 	client.port = getPortFromTCPAddr(server.listener.Addr())
 	client.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	client.waitUntilServerOnline()

server/http_handler_test.go

@@ -461,7 +461,7 @@ func (ts *basicHTTPHandlerTestSuite) startServer(t *testing.T) {
 	ts.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	ts.server = server
 	go func() {
-		err := server.Run()
+		err := server.Run(ts.domain)
 		require.NoError(t, err)
 	}()
 	ts.waitUntilServerOnline()

server/optimize_trace_test.go

@@ -53,7 +53,7 @@ func TestDumpOptimizeTraceAPI(t *testing.T) {
 	client.port = getPortFromTCPAddr(server.listener.Addr())
 	client.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	client.waitUntilServerOnline()

server/plan_replayer_test.go

@@ -90,7 +90,7 @@ func TestDumpPlanReplayerAPI(t *testing.T) {
 	client.port = getPortFromTCPAddr(server.listener.Addr())
 	client.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	client.waitUntilServerOnline()

server/server.go

@@ -392,14 +392,17 @@ func (s *Server) reportConfig() {
 }
 
 // Run runs the server.
-func (s *Server) Run() error {
+func (s *Server) Run(dom *domain.Domain) error {
 	metrics.ServerEventCounter.WithLabelValues(metrics.EventStart).Inc()
 	s.reportConfig()
 
 	// Start HTTP API to report tidb info such as TPS.
 	if s.cfg.Status.ReportStatus {
 		s.startStatusHTTP()
 	}
+	if config.GetGlobalConfig().Performance.ForceInitStats && dom != nil {
+		<-dom.StatsHandle().InitStatsDone
+	}
 	// If error should be reported and exit the server it can be sent on this
 	// channel. Otherwise, end with sending a nil error to signal "done"
 	errChan := make(chan error, 2)

server/statistics_handler_test.go

@@ -50,7 +50,7 @@ func TestDumpStatsAPI(t *testing.T) {
 	client.port = getPortFromTCPAddr(server.listener.Addr())
 	client.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	client.waitUntilServerOnline()

server/tidb_serial_test.go

@@ -162,7 +162,7 @@ func TestTLSAuto(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -207,7 +207,7 @@ func TestTLSBasic(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -271,7 +271,7 @@ func TestTLSVerify(t *testing.T) {
 	defer server.Close()
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -374,7 +374,7 @@ func TestErrorNoRollback(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	defer server.Close()
@@ -518,7 +518,7 @@ func TestReloadTLS(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)

server/tidb_test.go

@@ -112,7 +112,7 @@ func createTidbTestSuiteWithCfg(t *testing.T, cfg *config.Config) *tidbTestSuite
 	ts.server.InitGlobalConnID(ts.domain.ServerID)
 	ts.domain.InfoSyncer().SetSessionManager(ts.server)
 	go func() {
-		err := ts.server.Run()
+		err := ts.server.Run(nil)
 		require.NoError(t, err)
 	}()
 	ts.waitUntilServerOnline()
@@ -279,7 +279,7 @@ func TestStatusAPIWithTLS(t *testing.T) {
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	cli.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -337,7 +337,7 @@ func TestStatusAPIWithTLSCNCheck(t *testing.T) {
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	cli.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	defer server.Close()
@@ -400,7 +400,7 @@ func TestSocketForwarding(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -431,7 +431,7 @@ func TestSocket(t *testing.T) {
 	server, err := NewServer(cfg, ts.tidbdrv)
 	require.NoError(t, err)
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -466,7 +466,7 @@ func TestSocketAndIp(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	cli.waitUntilServerCanConnect()
@@ -629,7 +629,7 @@ func TestOnlySocket(t *testing.T) {
 	server, err := NewServer(cfg, ts.tidbdrv)
 	require.NoError(t, err)
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -1239,7 +1239,7 @@ func TestGracefulShutdown(t *testing.T) {
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	cli.statusPort = getPortFromTCPAddr(server.statusListener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -2511,7 +2511,7 @@ func TestLocalhostClientMapping(t *testing.T) {
 	require.NoError(t, err)
 	cli.port = getPortFromTCPAddr(server.listener.Addr())
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	defer server.Close()
@@ -3127,7 +3127,7 @@ func TestProxyProtocolWithIpFallbackable(t *testing.T) {
 	server, err := NewServer(cfg, ts.tidbdrv)
 	require.NoError(t, err)
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 100)
@@ -3191,7 +3191,7 @@ func TestProxyProtocolWithIpNoFallbackable(t *testing.T) {
 	server, err := NewServer(cfg, ts.tidbdrv)
 	require.NoError(t, err)
 	go func() {
-		err := server.Run()
+		err := server.Run(nil)
 		require.NoError(t, err)
 	}()
 	time.Sleep(time.Millisecond * 1000)

tidb-server/main.go

@@ -260,10 +260,8 @@ func main() {
 		close(exited)
 	})
 	topsql.SetupTopSQL()
-	if config.GetGlobalConfig().Performance.ForceInitStats {
-		<-dom.StatsHandle().InitStatsDone
-	}
-	terror.MustNil(svr.Run())
+
+	terror.MustNil(svr.Run(dom))
 	<-exited
 	syncLog()
 }