Skip to content

Commit 0123ee6

Browse files
authored
Revert "Revert change to default reapply type" (#5956)
## What changed? Change default `ResetReapply` enum value to `ALL_ELIGIBLE`. ## Why? Reverts #5688, i.e. after this PR we will have the behavior described in #5360. This means both signals *and* updates will be reapplied by default during resets and coinflict resolution, which is the product behavior we want. ### Explanation - #5360 attempted to introduce a new proto enum value and start using it as the default - However, that is not a valid single-deploy change, since it can cause a frontend client on the new version to send a value that is unknown to a history node on the old version. - Therefore #5688 reverted the change to the default, allowing the new proto enum value to be introduced to the codebase - This PR is deployable iff all clusters that we deploy to have #5360 deployed ## How did you test it? I didn't. Tests were added in the original PR #5360. ## Potential risks Could break reset or history conflict resolution. ## Is hotfix candidate? 1.25.1
1 parent 97d0437 commit 0123ee6

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

common/enums/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func SetDefaultContinueAsNewInitiator(f *enumspb.ContinueAsNewInitiator) {
7575

7676
func SetDefaultResetReapplyType(f *enumspb.ResetReapplyType) {
7777
if *f == enumspb.RESET_REAPPLY_TYPE_UNSPECIFIED {
78-
*f = enumspb.RESET_REAPPLY_TYPE_SIGNAL
78+
*f = enumspb.RESET_REAPPLY_TYPE_ALL_ELIGIBLE
7979
}
8080
}
8181

tests/reset_workflow.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,14 @@ func (s *FunctionalSuite) TestResetWorkflowAfterTimeout() {
344344
8 WorkflowExecutionCompleted`, events)
345345
}
346346

347+
func (s *FunctionalSuite) TestResetWorkflow_ExcludeNoneReapplyDefault() {
348+
t := resetTest{
349+
FunctionalSuite: s,
350+
tv: testvars.New(s.T()),
351+
}
352+
t.run()
353+
}
354+
347355
func (s *FunctionalSuite) TestResetWorkflow_ExcludeNoneReapplyAll() {
348356
t := resetTest{
349357
FunctionalSuite: s,

tests/xdc/history_replication_signals_and_updates_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,6 @@ func (c *hrsuTestCluster) resetWorkflow(ctx context.Context, workflowTaskFinishE
10151015
WorkflowExecution: c.t.tv.WorkflowExecution(),
10161016
Reason: "reset",
10171017
WorkflowTaskFinishEventId: workflowTaskFinishEventId,
1018-
ResetReapplyType: enumspb.RESET_REAPPLY_TYPE_ALL_ELIGIBLE,
10191018
})
10201019
c.t.s.NoError(err)
10211020
return resp.RunId

0 commit comments

Comments
 (0)