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

Add task token to activityDispatchInfo for worker #3672

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Add task token to activityDispatchInfo for worker #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d78f4
Add task token to activityDispatchInfo for worker
mkolodezny Oct 20, 2020
6398cc5
Merge branch 'master' into task
mkolodezny Oct 20, 2020
a04d526
refactor
mkolodezny Oct 20, 2020
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
1 change: 1 addition & 0 deletions service/history/decisionHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ Update_History_Loop:
msBuilder,
handler.decisionAttrValidator,
workflowSizeChecker,
handler.tokenSerializer,
handler.logger,
handler.domainCache,
handler.metricsClient,
Expand Down
19 changes: 19 additions & 0 deletions service/history/decisionTaskHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ type (
attrValidator *decisionAttrValidator
sizeLimitChecker *workflowSizeChecker

tokenSerializer common.TaskTokenSerializer

logger log.Logger
domainCache cache.DomainCache
metricsClient metrics.Client
Expand All @@ -77,6 +79,7 @@ func newDecisionTaskHandler(
mutableState execution.MutableState,
attrValidator *decisionAttrValidator,
sizeLimitChecker *workflowSizeChecker,
tokenSerializer common.TaskTokenSerializer,
logger log.Logger,
domainCache cache.DomainCache,
metricsClient metrics.Client,
Expand All @@ -102,6 +105,8 @@ func newDecisionTaskHandler(
attrValidator: attrValidator,
sizeLimitChecker: sizeLimitChecker,

tokenSerializer: tokenSerializer,

logger: logger,
domainCache: domainCache,
metricsClient: metricsClient,
Expand Down Expand Up @@ -249,6 +254,20 @@ func (handler *decisionTaskHandlerImpl) handleDecisionScheduleActivity(
if _, err1 := handler.mutableState.AddActivityTaskStartedEvent(ai, event.GetEventId(), uuid.New(), handler.identity); err1 != nil {
return nil, err1
}
token := &common.TaskToken{
DomainID: executionInfo.DomainID,
WorkflowID: executionInfo.WorkflowID,
WorkflowType: executionInfo.WorkflowTypeName,
RunID: executionInfo.RunID,
ScheduleID: ai.ScheduleID,
ScheduleAttempt: 0,
ActivityID: ai.ActivityID,
ActivityType: attr.ActivityType.GetName(),
}
activityDispatchInfo.TaskToken, err = handler.tokenSerializer.Serialize(token)
if err != nil {
return nil, ErrSerializingToken
}
activityDispatchInfo.ScheduledTimestamp = common.Int64Ptr(ai.ScheduledTime.UnixNano())
activityDispatchInfo.ScheduledTimestampOfThisAttempt = common.Int64Ptr(ai.ScheduledTime.UnixNano())
activityDispatchInfo.StartedTimestamp = common.Int64Ptr(ai.StartedTime.UnixNano())
Expand Down
2 changes: 2 additions & 0 deletions service/history/historyEngine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ var (
ErrWorkflowParent = &workflow.EntityNotExistsError{Message: "workflow parent does not match"}
// ErrDeserializingToken is the error to indicate task token is invalid
ErrDeserializingToken = &workflow.BadRequestError{Message: "error deserializing task token"}
// ErrSerializingToken is the error to indicate task token can not be serialized
ErrSerializingToken = &workflow.BadRequestError{Message: "error serializing task token"}
// ErrSignalOverSize is the error to indicate signal input size is > 256K
ErrSignalOverSize = &workflow.BadRequestError{Message: "signal input size is over 256K"}
// ErrCancellationAlreadyRequested is the error indicating cancellation for target workflow is already requested
Expand Down