Merge #38485

38485: importccl: fix fixtures import progress tracking r=tbg,dt a=danhhz

The total batches denominator was previously unset, so got the zero
value. This caused us to add infinite progress, which was truncated at
100%.

Release note: None

Co-authored-by: Daniel Harrison <[email protected]>

Author: craig[bot]

pkg/ccl/importccl/read_import_workload.go

@@ -136,6 +136,7 @@ func (w *workloadReader) readFiles(
 		}
 	}
 
+	wcs := make([]*WorkloadKVConverter, 0, len(dataFiles))
 	for _, fileName := range dataFiles {
 		file, err := url.Parse(fileName)
 		if err != nil {
@@ -172,8 +173,12 @@ func (w *workloadReader) readFiles(
 			return errors.Wrapf(err, `unknown table %s for generator %s`, conf.Table, meta.Name)
 		}
 
+		numTotalBatches += conf.BatchEnd - conf.BatchBegin
 		wc := NewWorkloadKVConverter(
 			w.table, t.InitialRows, int(conf.BatchBegin), int(conf.BatchEnd), w.kvCh)
+		wcs = append(wcs, wc)
+	}
+	for _, wc := range wcs {
 		if err := ctxgroup.GroupWorkers(ctx, runtime.NumCPU(), func(ctx context.Context) error {
 			evalCtx := w.evalCtx.Copy()
 			return wc.Worker(ctx, evalCtx, finishedBatchFn)