Fix expiringTimeNano inconsistent between active and passive (cadence…

…-workflow#1982)
avmi · Jun 11, 2019 · c4a2686 · c4a2686
1 parent ebcfc29
commit c4a2686
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/service/history/mutableStateBuilder.go b/service/history/mutableStateBuilder.go
@@ -3056,14 +3056,15 @@ func (e *mutableStateBuilder) AddContinueAsNewEvent(
 func rolloverAutoResetPointsWithExpiringTime(
 	resetPoints *workflow.ResetPoints,
 	prevRunID string,
+	nowNano int64,
 	domainRetentionDays int32,
 ) *workflow.ResetPoints {
 
 	if resetPoints == nil || resetPoints.Points == nil {
 		return resetPoints
 	}
 	newPoints := make([]*workflow.ResetPointInfo, 0, len(resetPoints.Points))
-	expiringTimeNano := time.Now().Add(time.Duration(domainRetentionDays) * time.Hour * 24).UnixNano()
+	expiringTimeNano := nowNano + int64(time.Duration(domainRetentionDays)*time.Hour*24)
 	for _, rp := range resetPoints.Points {
 		if rp.GetRunId() == prevRunID {
 			rp.ExpiringTimeNano = common.Int64Ptr(expiringTimeNano)
@@ -3149,7 +3150,7 @@ func (e *mutableStateBuilder) ReplicateWorkflowExecutionContinuedAsNewEvent(
 		CronSchedule:            startedAttributes.GetCronSchedule(),
 		EventStoreVersion:       newStateBuilder.GetEventStoreVersion(),
 		BranchToken:             newStateBuilder.GetCurrentBranch(),
-		PreviousAutoResetPoints: rolloverAutoResetPointsWithExpiringTime(startedAttributes.GetPrevAutoResetPoints(), prevRunID, domainRetentionDays),
+		PreviousAutoResetPoints: rolloverAutoResetPointsWithExpiringTime(startedAttributes.GetPrevAutoResetPoints(), prevRunID, continueAsNewEvent.GetTimestamp(), domainRetentionDays),
 	}
 
 	if continueAsNew.HasRetryPolicy {