Relax stamp validation for legacy activity tasks

Author: yiminc

service/history/api/isactivitytaskvalid/api.go

@@ -57,8 +57,13 @@ func isActivityTaskValid(
 	}
 
 	ai, ok := mutableState.GetActivityInfo(scheduledEventID)
-	if ok && ai.StartedEventId == common.EmptyEventID && ai.GetStamp() == stamp {
-		return true, nil
+	if !ok || ai.StartedEventId != common.EmptyEventID {
+		return false, nil
 	}
-	return false, nil
+
+	if ai.GetStamp() > 0 && stamp > 0 && ai.GetStamp() != stamp {
+		return false, nil
+	}
+
+	return true, nil
 }

service/history/api/isactivitytaskvalid/api_test.go

@@ -89,17 +89,32 @@ func (s *apiSuite) TestWorkflowRunning_ActivityTaskStarted() {
 func (s *apiSuite) TestWorkflowRunning_ActivityTaskStampMismatch() {
 	s.mutableState.EXPECT().IsWorkflowExecutionRunning().Return(true)
 	activityScheduleEventID := rand.Int63()
+	const storedStamp = int32(456)
 	s.mutableState.EXPECT().GetActivityInfo(activityScheduleEventID).Return(&persistencespb.ActivityInfo{
 		ScheduledEventId: activityScheduleEventID,
 		StartedEventId:   common.EmptyEventID,
-		Stamp:            rand.Int31(),
+		Stamp:            storedStamp,
 	}, true)
 
-	valid, err := isActivityTaskValid(s.workflowLease, activityScheduleEventID, rand.Int31())
+	valid, err := isActivityTaskValid(s.workflowLease, activityScheduleEventID, storedStamp+1)
 	s.NoError(err)
 	s.False(valid)
 }
 
+func (s *apiSuite) TestWorkflowRunning_ActivityTaskStampLegacy() {
+	s.mutableState.EXPECT().IsWorkflowExecutionRunning().Return(true)
+	activityScheduleEventID := rand.Int63()
+	s.mutableState.EXPECT().GetActivityInfo(activityScheduleEventID).Return(&persistencespb.ActivityInfo{
+		ScheduledEventId: activityScheduleEventID,
+		StartedEventId:   common.EmptyEventID,
+		Stamp:            0,
+	}, true)
+
+	valid, err := isActivityTaskValid(s.workflowLease, activityScheduleEventID, 0)
+	s.NoError(err)
+	s.True(valid)
+}
+
 func (s *apiSuite) TestWorkflowRunning_ActivityTaskMissing() {
 	s.mutableState.EXPECT().IsWorkflowExecutionRunning().Return(true)
 	activityScheduleEventID := rand.Int63()