executor: Enlarge the timeout for fetching TiFlash system tables (#57967) (#57977)

ti-chi-bot · web-flow · commit 9f4dec9f4550 · 2024-12-06T04:45:32.000Z
close #57816
diff --git a/pkg/executor/infoschema_reader.go b/pkg/executor/infoschema_reader.go
@@ -3078,9 +3078,10 @@ func (e *TiFlashSystemTableRetriever) dataForTiFlashSystemTables(ctx context.Con
 	if !ok {
 		return nil, errors.New("Get tiflash system tables can only run with tikv compatible storage")
 	}
-	// send request to tiflash, timeout is 1s
+	// send request to tiflash, use 5 minutes as per-request timeout
 	instanceID := e.instanceIds[e.instanceIdx]
-	resp, err := tikvStore.GetTiKVClient().SendRequest(ctx, instanceID, &request, time.Second)
+	timeout := time.Duration(5*60) * time.Second
+	resp, err := tikvStore.GetTiKVClient().SendRequest(ctx, instanceID, &request, timeout)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -3078,9 +3078,10 @@ func (e *TiFlashSystemTableRetriever) dataForTiFlashSystemTables(ctx context.Con`
`3078`	`3078`	`if !ok {`
`3079`	`3079`	`return nil, errors.New("Get tiflash system tables can only run with tikv compatible storage")`
`3080`	`3080`	`}`
`3081`		`- // send request to tiflash, timeout is 1s`
	`3081`	`+ // send request to tiflash, use 5 minutes as per-request timeout`
`3082`	`3082`	`instanceID := e.instanceIds[e.instanceIdx]`
`3083`		`- resp, err := tikvStore.GetTiKVClient().SendRequest(ctx, instanceID, &request, time.Second)`
	`3083`	`+ timeout := time.Duration(560) time.Second`
	`3084`	`+ resp, err := tikvStore.GetTiKVClient().SendRequest(ctx, instanceID, &request, timeout)`
`3084`	`3085`	`if err != nil {`
`3085`	`3086`	`return nil, errors.Trace(err)`
`3086`	`3087`	`}`