Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: keep progress in information_schema.tiflash_replica two digits after the decimal point #38415

Merged
merged 5 commits into from
Oct 12, 2022
Merged

executor: keep progress in information_schema.tiflash_replica two digits after the decimal point #38415

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d40b28b
fix progress decimal in partition table
hehechen Oct 12, 2022
30ee7bd
add log
hehechen Oct 12, 2022
8ce584a
Merge branch 'master' into update_progress
ti-chi-bot Oct 12, 2022
35ee4ed
Merge branch 'master' into update_progress
ti-chi-bot Oct 12, 2022
5065f52
Merge branch 'master' into update_progress
ti-chi-bot Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ddl/ddl_tiflash_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,10 @@ func getTiFlashTableSyncProgress(pollTiFlashContext *TiFlashManagementContext, t
zap.Int64("tableID", tableID), zap.Int("tiflashPeerCount", tiflashPeerCount), zap.Int("regionCount", regionCount), zap.Uint64("replicaCount", replicaCount))
progress = 1
}
if progress < 1 {
logutil.BgLogger().Debug("TiFlash replica progress < 1.",
zap.Int64("tableID", tableID), zap.Int("tiflashPeerCount", tiflashPeerCount), zap.Int("regionCount", regionCount), zap.Uint64("replicaCount", replicaCount))
}
return types.TruncateFloatToString(progress, 2), nil
}

Expand Down
2 changes: 2 additions & 0 deletions executor/infoschema_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,6 +2223,8 @@ func (e *memtableRetriever) dataForTableTiFlashReplica(ctx sessionctx.Context, s
progress += progressMap[p.ID]
}
progress = progress / float64(len(pi.Definitions))
progressString := types.TruncateFloatToString(progress, 2)
progress, _ = strconv.ParseFloat(progressString, 64)
} else {
progress = progressMap[tbl.ID]
}
Expand Down