Skip to content

Add missing mappers for CronOverlapPolicy and ActiveCluster #1450

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

Merged
merged 3 commits into from
Aug 8, 2025
Merged

Add missing mappers for CronOverlapPolicy and ActiveCluster #1450

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
d858d50
mapper fix 1
timl3136 Aug 7, 2025
a102dd4
more fix
timl3136 Aug 7, 2025
b0fd303
minor testdata
timl3136 Aug 7, 2025
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: 4 additions & 0 deletions internal/compatibility/proto/decision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func Decision(d *shared.Decision) *apiv1.Decision {
Memo: Memo(attr.Memo),
SearchAttributes: SearchAttributes(attr.SearchAttributes),
JitterStart: secondsToDuration(attr.JitterStartSeconds),
CronOverlapPolicy: CronOverlapPolicy(attr.CronOverlapPolicy),
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicy(attr.ActiveClusterSelectionPolicy),
},
}
case shared.DecisionTypeStartChildWorkflowExecution:
Expand All @@ -163,6 +165,8 @@ func Decision(d *shared.Decision) *apiv1.Decision {
Header: Header(attr.Header),
Memo: Memo(attr.Memo),
SearchAttributes: SearchAttributes(attr.SearchAttributes),
CronOverlapPolicy: CronOverlapPolicy(attr.CronOverlapPolicy),
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicy(attr.ActiveClusterSelectionPolicy),
},
}
case shared.DecisionTypeSignalExternalWorkflowExecution:
Expand Down
1 change: 1 addition & 0 deletions internal/compatibility/proto/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ func WorkflowExecutionInfo(t *shared.WorkflowExecutionInfo) *apiv1.WorkflowExecu
AutoResetPoints: ResetPoints(t.AutoResetPoints),
TaskList: t.GetTaskList(),
IsCron: t.GetIsCron(),
CronOverlapPolicy: CronOverlapPolicy(t.CronOverlapPolicy),
}
}

Expand Down
1 change: 1 addition & 0 deletions internal/compatibility/testdata/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const (
HostName = "HostName"
Identity = "Identity"
CronSchedule = "CronSchedule"
CronOverlapPolicy = 0
Checksum = "Checksum"
Reason = "Reason"
Cause = "Cause"
Expand Down
4 changes: 4 additions & 0 deletions internal/compatibility/testdata/decision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ var (
Memo: &Memo,
SearchAttributes: &SearchAttributes,
JitterStart: Duration4,
CronOverlapPolicy: apiv1.CronOverlapPolicy_CRON_OVERLAP_POLICY_SKIPPED,
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicyRegionSticky,
}
FailWorkflowExecutionDecisionAttributes = apiv1.FailWorkflowExecutionDecisionAttributes{
Failure: &Failure,
Expand Down Expand Up @@ -162,6 +164,8 @@ var (
Header: &Header,
Memo: &Memo,
SearchAttributes: &SearchAttributes,
CronOverlapPolicy: apiv1.CronOverlapPolicy_CRON_OVERLAP_POLICY_SKIPPED,
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicyRegionSticky,
}
StartTimerDecisionAttributes = apiv1.StartTimerDecisionAttributes{
TimerId: TimerID,
Expand Down
4 changes: 4 additions & 0 deletions internal/compatibility/thrift/decision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ func Decision(d *apiv1.Decision) *shared.Decision {
Memo: Memo(a.Memo),
SearchAttributes: SearchAttributes(a.SearchAttributes),
JitterStartSeconds: durationToSeconds(a.JitterStart),
CronOverlapPolicy: CronOverlapPolicy(a.CronOverlapPolicy),
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicy(a.ActiveClusterSelectionPolicy),
}
case *apiv1.Decision_StartChildWorkflowExecutionDecisionAttributes:
decision.DecisionType = shared.DecisionTypeStartChildWorkflowExecution.Ptr()
Expand All @@ -156,6 +158,8 @@ func Decision(d *apiv1.Decision) *shared.Decision {
Header: Header(a.Header),
Memo: Memo(a.Memo),
SearchAttributes: SearchAttributes(a.SearchAttributes),
CronOverlapPolicy: CronOverlapPolicy(a.CronOverlapPolicy),
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicy(a.ActiveClusterSelectionPolicy),
}
case *apiv1.Decision_SignalExternalWorkflowExecutionDecisionAttributes:
decision.DecisionType = shared.DecisionTypeSignalExternalWorkflowExecution.Ptr()
Expand Down
30 changes: 16 additions & 14 deletions internal/compatibility/thrift/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,20 +421,22 @@ func WorkflowExecutionInfo(t *apiv1.WorkflowExecutionInfo) *shared.WorkflowExecu
return nil
}
return &shared.WorkflowExecutionInfo{
Execution: WorkflowExecution(t.WorkflowExecution),
Type: WorkflowType(t.Type),
StartTime: timeToUnixNano(t.StartTime),
CloseTime: timeToUnixNano(t.CloseTime),
CloseStatus: WorkflowExecutionCloseStatus(t.CloseStatus),
HistoryLength: &t.HistoryLength,
ParentDomainId: ParentDomainID(t.ParentExecutionInfo),
ParentExecution: ParentWorkflowExecution(t.ParentExecutionInfo),
ExecutionTime: timeToUnixNano(t.ExecutionTime),
Memo: Memo(t.Memo),
SearchAttributes: SearchAttributes(t.SearchAttributes),
AutoResetPoints: ResetPoints(t.AutoResetPoints),
TaskList: &t.TaskList,
IsCron: &t.IsCron,
Execution: WorkflowExecution(t.WorkflowExecution),
Type: WorkflowType(t.Type),
StartTime: timeToUnixNano(t.StartTime),
CloseTime: timeToUnixNano(t.CloseTime),
CloseStatus: WorkflowExecutionCloseStatus(t.CloseStatus),
HistoryLength: &t.HistoryLength,
ParentDomainId: ParentDomainID(t.ParentExecutionInfo),
ParentExecution: ParentWorkflowExecution(t.ParentExecutionInfo),
ExecutionTime: timeToUnixNano(t.ExecutionTime),
Memo: Memo(t.Memo),
SearchAttributes: SearchAttributes(t.SearchAttributes),
AutoResetPoints: ResetPoints(t.AutoResetPoints),
TaskList: &t.TaskList,
IsCron: &t.IsCron,
CronOverlapPolicy: CronOverlapPolicy(t.CronOverlapPolicy),
ActiveClusterSelectionPolicy: ActiveClusterSelectionPolicy(t.ActiveClusterSelectionPolicy),
}
}

Expand Down
1 change: 1 addition & 0 deletions internal/internal_workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ type (
dataConverter DataConverter
retryPolicy *shared.RetryPolicy
cronSchedule string
cronOverlapPolicy shared.CronOverlapPolicy
contextPropagators []ContextPropagator
memo map[string]interface{}
searchAttributes map[string]interface{}
Expand Down
8 changes: 5 additions & 3 deletions internal/internal_workflow_testsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,10 @@ type (
workerStopChannel chan struct{}
sessionEnvironment *testSessionEnvironmentImpl

cronSchedule string
cronIterations int
workflowInput []byte
cronSchedule string
cronIterations int
workflowInput []byte
cronOverlapPolicy shared.CronOverlapPolicy
}

testSessionEnvironmentImpl struct {
Expand Down Expand Up @@ -391,6 +392,7 @@ func (env *testWorkflowEnvironmentImpl) newTestWorkflowEnvironmentForChild(param
childEnv.workflowInfo.ParentWorkflowDomain = &env.workflowInfo.Domain
childEnv.workflowInfo.ParentWorkflowExecution = &env.workflowInfo.WorkflowExecution
childEnv.executionTimeout = time.Duration(*params.executionStartToCloseTimeoutSeconds) * time.Second
childEnv.cronOverlapPolicy = params.cronOverlapPolicy
if workflowHandler, ok := env.runningWorkflows[params.workflowID]; ok {
// duplicate workflow ID
if !workflowHandler.handled {
Expand Down