Skip to content

Commit

Permalink
Merge pull request #89065 from knz/20220930-backup
Browse files Browse the repository at this point in the history
  • Loading branch information
knz authored Sep 30, 2022
2 parents f416936 + 6fe013b commit b6abff3
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkg/ccl/backupccl/backup_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ func runBackupProcessor(
// *2). See #49798.
numSenders := int(kvserver.ExportRequestsLimit.Get(&clusterSettings.SV)) * 2

logExport := log.Every(1 * time.Minute)

return ctxgroup.GroupWorkers(ctx, numSenders, func(ctx context.Context, _ int) error {
readTime := spec.BackupEndTime.GoTime()

Expand Down Expand Up @@ -415,8 +417,13 @@ func runBackupProcessor(
Source: roachpb.AdmissionHeader_FROM_SQL,
NoMemoryReservedAtSource: true,
}
log.Infof(ctx, "sending ExportRequest for span %s (attempt %d, priority %s)",
span.span, span.attempts+1, header.UserPriority.String())
if span.attempts > 0 || logExport.ShouldLog() {
log.Infof(ctx, "sending ExportRequest for span %s (attempt %d, priority %s)",
span.span, span.attempts+1, header.UserPriority.String())
} else {
log.VEventf(ctx, 1, "sending ExportRequest for span %s (attempt %d, priority %s)",
span.span, span.attempts+1, header.UserPriority.String())
}
var rawRes roachpb.Response
var pErr *roachpb.Error
var reqSentTime time.Time
Expand Down

0 comments on commit b6abff3

Please sign in to comment.