Fix

Signed-off-by: David Porter <david.porter@uber.com>

Author: David Porter

common/persistence/execution_manager_test.go

@@ -1441,6 +1441,7 @@ func sampleInternalWorkflowMutation() *InternalWorkflowMutation {
 				TimerID: "test-timer",
 			},
 		},
+		WorkflowTimerTasks: sampleEventData(),
 		UpsertChildExecutionInfos: []*InternalChildExecutionInfo{
 			{
 				DomainID:         testDomainID,

service/history/execution/mutable_state_builder.go

@@ -324,6 +324,7 @@ func (e *mutableStateBuilder) CopyToPersistence() *persistence.WorkflowMutableSt
 	state.Checksum = e.checksum
 	state.ReplicationState = e.replicationState
 	state.ExecutionStats = e.executionStats
+	state.WorkflowTimerTaskInfos = e.workflowTimerTaskInfos
 
 	return state
 }

service/history/execution/mutable_state_builder_test.go

@@ -3491,31 +3491,31 @@ func TestCloseTransactionAsMutation(t *testing.T) {
 					DecisionRequestID:    commonconstants.EmptyUUID,
 					DecisionStartedID:    commonconstants.EmptyEventID,
 				},
-			TasksByCategory: map[persistence.HistoryTaskCategory][]persistence.Task{
-				persistence.HistoryTaskCategoryTransfer:    nil,
-				persistence.HistoryTaskCategoryTimer:       nil,
-				persistence.HistoryTaskCategoryReplication: nil,
-			},
-			UpsertActivityInfos:       []*persistence.ActivityInfo{},
-			DeleteActivityInfos:       []int64{},
-			UpsertTimerInfos:          []*persistence.TimerInfo{},
-			DeleteTimerInfos:          []string{},
-			WorkflowTimerTasks:        nil,
-			UpsertChildExecutionInfos: []*persistence.ChildExecutionInfo{},
-			UpsertRequestCancelInfos:  []*persistence.RequestCancelInfo{},
-			DeleteRequestCancelInfos:  []int64{},
-			UpsertSignalInfos:         []*persistence.SignalInfo{},
-			DeleteSignalInfos:         []int64{},
-			UpsertSignalRequestedIDs:  []string{},
-			DeleteSignalRequestedIDs:  []string{},
-			DeleteChildExecutionInfos: []int64{},
-			WorkflowRequests:          []*persistence.WorkflowRequest{},
-			Condition:                 0,
-		},
-		expectedEvent: nil,
-		expectedErr:   nil,
-	},
-	"with buffered events": {
+				TasksByCategory: map[persistence.HistoryTaskCategory][]persistence.Task{
+					persistence.HistoryTaskCategoryTransfer:    nil,
+					persistence.HistoryTaskCategoryTimer:       nil,
+					persistence.HistoryTaskCategoryReplication: nil,
+				},
+				UpsertActivityInfos:       []*persistence.ActivityInfo{},
+				DeleteActivityInfos:       []int64{},
+				UpsertTimerInfos:          []*persistence.TimerInfo{},
+				DeleteTimerInfos:          []string{},
+				WorkflowTimerTasks:        nil,
+				UpsertChildExecutionInfos: []*persistence.ChildExecutionInfo{},
+				UpsertRequestCancelInfos:  []*persistence.RequestCancelInfo{},
+				DeleteRequestCancelInfos:  []int64{},
+				UpsertSignalInfos:         []*persistence.SignalInfo{},
+				DeleteSignalInfos:         []int64{},
+				UpsertSignalRequestedIDs:  []string{},
+				DeleteSignalRequestedIDs:  []string{},
+				DeleteChildExecutionInfos: []int64{},
+				WorkflowRequests:          []*persistence.WorkflowRequest{},
+				Condition:                 0,
+			},
+			expectedEvent: nil,
+			expectedErr:   nil,
+		},
+		"with buffered events": {
 			mutableStateSetup: func(ms *mutableStateBuilder) {
 				ms.executionInfo.DomainID = "some-domain-id"
 				ms.executionInfo.NextEventID = 10
@@ -3580,33 +3580,33 @@ func TestCloseTransactionAsMutation(t *testing.T) {
 						},
 					},
 				},
-			UpsertActivityInfos:       []*persistence.ActivityInfo{},
-			DeleteActivityInfos:       []int64{},
-			UpsertTimerInfos:          []*persistence.TimerInfo{},
-			DeleteTimerInfos:          []string{},
-			WorkflowTimerTasks:        nil,
-			UpsertChildExecutionInfos: []*persistence.ChildExecutionInfo{},
-			UpsertRequestCancelInfos:  []*persistence.RequestCancelInfo{},
-			DeleteRequestCancelInfos:  []int64{},
-			UpsertSignalInfos:         []*persistence.SignalInfo{},
-			DeleteSignalInfos:         []int64{},
-			UpsertSignalRequestedIDs:  []string{},
-			DeleteSignalRequestedIDs:  []string{},
-			DeleteChildExecutionInfos: []int64{},
-			WorkflowRequests:          []*persistence.WorkflowRequest{},
-			Condition:                 0,
-		},
-		expectedEvent: []*persistence.WorkflowEvents{
-			{
-				DomainID: "some-domain-id",
-				Events: []*types.HistoryEvent{{
-					ID: 1, EventType: types.EventTypeWorkflowExecutionStarted.Ptr()},
+				UpsertActivityInfos:       []*persistence.ActivityInfo{},
+				DeleteActivityInfos:       []int64{},
+				UpsertTimerInfos:          []*persistence.TimerInfo{},
+				DeleteTimerInfos:          []string{},
+				WorkflowTimerTasks:        nil,
+				UpsertChildExecutionInfos: []*persistence.ChildExecutionInfo{},
+				UpsertRequestCancelInfos:  []*persistence.RequestCancelInfo{},
+				DeleteRequestCancelInfos:  []int64{},
+				UpsertSignalInfos:         []*persistence.SignalInfo{},
+				DeleteSignalInfos:         []int64{},
+				UpsertSignalRequestedIDs:  []string{},
+				DeleteSignalRequestedIDs:  []string{},
+				DeleteChildExecutionInfos: []int64{},
+				WorkflowRequests:          []*persistence.WorkflowRequest{},
+				Condition:                 0,
+			},
+			expectedEvent: []*persistence.WorkflowEvents{
+				{
+					DomainID: "some-domain-id",
+					Events: []*types.HistoryEvent{{
+						ID: 1, EventType: types.EventTypeWorkflowExecutionStarted.Ptr()},
+					},
 				},
 			},
+			expectedErr: nil,
 		},
-		expectedErr: nil,
-	},
-}
+	}
 
 	for name, td := range tests {