Merge pull request #2700 from michael-berlin/hotrow_change_timeout

vttablet: Hot Row protection: Use longer timeout when limiting the wait.

go/vt/vttablet/tabletserver/tabletserver.go

@@ -966,7 +966,9 @@ func (tsv *TabletServer) beginWaitForSameRangeTransactions(ctx context.Context,
 	var txDone txserializer.DoneFunc
 
 	err := tsv.execRequest(
-		ctx, tsv.BeginTimeout.Get(),
+		// Use (potentially longer) -queryserver-config-query-timeout and not
+		// -queryserver-config-txpool-timeout (defaults to 1s) to limit the waiting.
+		ctx, tsv.QueryTimeout.Get(),
 		"waitForSameRangeTransactions", "waitForSameRangeTransactions", nil,
 		target, true /* isTx */, false, /* allowOnShutdown */
 		func(ctx context.Context, logStats *tabletenv.LogStats) error {