Fix missing start time in executions table (cadence-workflow#2687)

MirrorFork · Oct 18, 2019 · 1da0ebf · 1da0ebf
1 parent a6e1211
commit 1da0ebf
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 42 deletions.
diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -74,7 +74,7 @@ type (
 		taskAllocator             taskAllocator
 		replicator                *historyReplicator
 		nDCReplicator             nDCHistoryReplicator
-		activityReplicator        activityReplicator
+		nDCactivityReplicator     nDCActivityReplicator
 		replicatorProcessor       ReplicatorQueueProcessor
 		historyEventNotifier      historyEventNotifier
 		tokenSerializer           common.TaskTokenSerializer
@@ -209,7 +209,7 @@ func NewEngineWithShardContext(
 			historyEngImpl.eventsReapplier,
 			logger,
 		)
-		historyEngImpl.activityReplicator = newActivityReplicator(
+		historyEngImpl.nDCactivityReplicator = newNDCActivityReplicator(
 			shard,
 			historyCache,
 			logger,
@@ -1970,7 +1970,7 @@ func (e *historyEngineImpl) SyncActivity(
 	request *h.SyncActivityRequest,
 ) (retError error) {
 
-	return e.activityReplicator.SyncActivity(ctx, request)
+	return e.nDCactivityReplicator.SyncActivity(ctx, request)
 }
 
 func (e *historyEngineImpl) ResetWorkflowExecution(

diff --git a/service/history/activityReplicator.go → service/history/nDCActivityReplicator.go b/service/history/activityReplicator.go → service/history/nDCActivityReplicator.go
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-//go:generate mockgen -copyright_file ../../LICENSE -package $GOPACKAGE -source $GOFILE -destination activityReplicator_mock.go
+//go:generate mockgen -copyright_file ../../LICENSE -package $GOPACKAGE -source $GOFILE -destination nDCActivityReplicator_mock.go
 
 package history
 
@@ -39,34 +39,34 @@ import (
 )
 
 type (
-	activityReplicator interface {
+	nDCActivityReplicator interface {
 		SyncActivity(
 			ctx ctx.Context,
 			request *h.SyncActivityRequest,
 		) error
 	}
 
-	activityReplicatorImpl struct {
+	nDCActivityReplicatorImpl struct {
 		historyCache    *historyCache
 		clusterMetadata cluster.Metadata
 		logger          log.Logger
 	}
 )
 
-func newActivityReplicator(
+func newNDCActivityReplicator(
 	shard ShardContext,
 	historyCache *historyCache,
 	logger log.Logger,
-) *activityReplicatorImpl {
+) *nDCActivityReplicatorImpl {
 
-	return &activityReplicatorImpl{
+	return &nDCActivityReplicatorImpl{
 		historyCache:    historyCache,
 		clusterMetadata: shard.GetService().GetClusterMetadata(),
 		logger:          logger.WithTags(tag.ComponentHistoryReplicator),
 	}
 }
 
-func (r *activityReplicatorImpl) SyncActivity(
+func (r *nDCActivityReplicatorImpl) SyncActivity(
 	ctx ctx.Context,
 	request *h.SyncActivityRequest,
 ) (retError error) {
@@ -189,7 +189,7 @@ func (r *activityReplicatorImpl) SyncActivity(
 	return context.updateWorkflowExecutionAsPassive(now)
 }
 
-func (r *activityReplicatorImpl) shouldApplySyncActivity(
+func (r *nDCActivityReplicatorImpl) shouldApplySyncActivity(
 	domainID string,
 	workflowID string,
 	runID string,

diff --git a/service/history/activityReplicator_mock.go → ...ice/history/nDCActivityReplicator_mock.go b/service/history/activityReplicator_mock.go → ...ice/history/nDCActivityReplicator_mock.go
diff --git a/service/history/activityReplicator_test.go → ...ice/history/nDCActivityReplicator_test.go b/service/history/activityReplicator_test.go → ...ice/history/nDCActivityReplicator_test.go
@@ -68,7 +68,7 @@ type (
 		mockTimerProcessor       *MockTimerQueueProcessor
 		historyCache             *historyCache
 
-		activityReplicator activityReplicator
+		nDCActivityReplicator nDCActivityReplicator
 	}
 )
 
@@ -152,7 +152,7 @@ func (s *activityReplicatorSuite) SetupTest() {
 	}
 	s.mockShard.SetEngine(engine)
 
-	s.activityReplicator = newActivityReplicator(
+	s.nDCActivityReplicator = newNDCActivityReplicator(
 		s.mockShard,
 		s.historyCache,
 		s.logger,
@@ -207,7 +207,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_WorkflowNotFound() {
 		), nil,
 	)
 
-	err := s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err := s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -256,7 +256,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_WorkflowClosed() {
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -313,7 +313,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_IncomingScheduleIDLarger_Inco
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -370,7 +370,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_IncomingScheduleIDLarger_Inco
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(newRetryTaskErrorWithHint(ErrRetrySyncActivityMsg, domainID, workflowID, runID, nextEventID), err)
 }
 
@@ -449,7 +449,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_VersionHistories_IncomingVers
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -527,7 +527,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_DifferentVersionHistories_Inc
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(newNDCRetryTaskErrorWithHint(
 		domainID,
 		workflowID,
@@ -619,7 +619,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_VersionHistories_IncomingSche
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(newNDCRetryTaskErrorWithHint(
 		domainID,
 		workflowID,
@@ -708,7 +708,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_VersionHistories_SameSchedule
 		), nil,
 	)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -765,7 +765,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_ActivityCompleted() {
 	)
 	msBuilder.On("GetActivityInfo", scheduleID).Return(nil, false)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -824,7 +824,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_ActivityRunning_LocalActivity
 		Version: lastWriteVersion - 1,
 	}, true)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Nil(err)
 }
 
@@ -901,7 +901,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_ActivityRunning_Update_SameVe
 	expectedErr := errors.New("this is error is used to by pass lots of mocking")
 	msBuilder.On("ReplicateActivityInfo", request, false).Return(expectedErr)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(expectedErr, err)
 }
 
@@ -978,7 +978,7 @@ func (s *activityReplicatorSuite) TestSyncActivity_ActivityRunning_Update_SameVe
 	expectedErr := errors.New("this is error is used to by pass lots of mocking")
 	msBuilder.On("ReplicateActivityInfo", request, true).Return(expectedErr)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(expectedErr, err)
 }
 
@@ -1055,6 +1055,6 @@ func (s *activityReplicatorSuite) TestSyncActivity_ActivityRunning_Update_Larger
 	expectedErr := errors.New("this is error is used to by pass lots of mocking")
 	msBuilder.On("ReplicateActivityInfo", request, true).Return(expectedErr)
 
-	err = s.activityReplicator.SyncActivity(ctx.Background(), request)
+	err = s.nDCActivityReplicator.SyncActivity(ctx.Background(), request)
 	s.Equal(expectedErr, err)
 }
diff --git a/service/history/nDCStateRebuilder.go b/service/history/nDCStateRebuilder.go
@@ -171,6 +171,8 @@ func (r *nDCStateRebuilderImpl) rebuild(
 		return nil, 0, err
 	}
 
+	// mutable state rebuild should use the same time stamp
+	rebuiltMutableState.GetExecutionInfo().StartTimestamp = now
 	return rebuiltMutableState, r.rebuiltHistorySize, nil
 }
 

diff --git a/service/history/nDCStateRebuilder_test.go b/service/history/nDCStateRebuilder_test.go
@@ -345,4 +345,5 @@ func (s *nDCStateRebuilderSuite) TestRebuild() {
 			[]*persistence.VersionHistoryItem{persistence.NewVersionHistoryItem(lastEventID, version)},
 		),
 	), rebuildMutableState.GetVersionHistories())
+	s.Equal(rebuildMutableState.GetExecutionInfo().StartTimestamp, now)
 }