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

CDNC-2088 #5094

Merged
merged 4 commits into from
Feb 14, 2023
Merged

CDNC-2088 #5094

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d99ac3f
CDNC-2088
bowenxia Feb 13, 2023
d09f8d7
Merge branch 'master' into test
bowenxia Feb 13, 2023
9ea613f
delete comments that was used for self reminder
bowenxia Feb 14, 2023
1499bbe
add attemptCount to log
bowenxia Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/log/tag/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,8 @@ func Attempt(attempt int32) Tag {
}

// AttemptCount returns tag for AttemptCount
func AttemptCount(attemptCount int64) Tag {
return newInt64("attempt-count", attemptCount)
func AttemptCount(attemptCount int) Tag {
return newInt("attempt-count", attemptCount)
}

// AttemptStart returns tag for AttemptStart
Expand Down
4 changes: 3 additions & 1 deletion service/history/task/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,12 @@ func (t *taskImpl) HandleErr(
t.attempt++
if t.attempt > t.criticalRetryCount() {
t.scope.RecordTimer(metrics.TaskAttemptTimerPerDomain, time.Duration(t.attempt))
t.logger.Error("Critical error processing task, retrying.",
t.logger.Error("Critical error processing task, retrying.", // TODO: there might be more. If there is, do the same thing
tag.Error(err),
tag.OperationCritical,
// fixme!!! Add a new tag attempt into TaskType.log the attempt
neil-xie marked this conversation as resolved.
Show resolved Hide resolved
tag.TaskType(t.GetTaskType()),
tag.AttemptCount(t.GetAttempt()),
)
}
}
Expand Down