Skip to content

Commit

Permalink
Revert "Implement decision Heartbeat timeout (#2324)"
Browse files Browse the repository at this point in the history 
This reverts commit 26083c9.
  • Loading branch information
@yycptt
yycptt committed Aug 13, 2019
1 parent 4b95faa commit 8d01472
Show file tree
Hide file tree
Showing 25 changed files with 408 additions and 643 deletions.
166 changes: 61 additions & 105 deletions .gen/go/sqlblobs/sqlblobs.go
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions common/metrics/defs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,6 @@ const (
RemoveEngineForShardLatency
CompleteDecisionWithStickyEnabledCounter
CompleteDecisionWithStickyDisabledCounter
DecisionHeartbeatTimeoutCounter
HistoryEventNotificationQueueingLatency
HistoryEventNotificationFanoutLatency
HistoryEventNotificationInFlightMessageGauge
Expand Down Expand Up @@ -1660,7 +1659,6 @@ var MetricDefs = map[ServiceIdx]map[int]metricDefinition{
RemoveEngineForShardLatency: {metricName: "remove_engine_for_shard_latency", metricType: Timer},
CompleteDecisionWithStickyEnabledCounter: {metricName: "complete_decision_sticky_enabled_count", metricType: Counter},
CompleteDecisionWithStickyDisabledCounter: {metricName: "complete_decision_sticky_disabled_count", metricType: Counter},
DecisionHeartbeatTimeoutCounter: {metricName: "decision_heartbeat_timeout_count", metricType: Counter},
HistoryEventNotificationQueueingLatency: {metricName: "history_event_notification_queueing_latency", metricType: Timer},
HistoryEventNotificationFanoutLatency: {metricName: "history_event_notification_fanout_latency", metricType: Timer},
HistoryEventNotificationInFlightMessageGauge: {metricName: "history_event_notification_inflight_message_gauge", metricType: Gauge},
Expand Down
1 change: 0 additions & 1 deletion common/persistence/cassandra/cassandraPersistence.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ const (
`decision_attempt: ?, ` +
`decision_timestamp: ?, ` +
`decision_scheduled_timestamp: ?, ` +
`decision_original_scheduled_timestamp: ?, ` +
`cancel_requested: ?, ` +
`cancel_request_id: ?, ` +
`sticky_task_list: ?, ` +
Expand Down
6 changes: 0 additions & 6 deletions common/persistence/cassandra/cassandraPersistenceUtil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@ func createExecution(
executionInfo.DecisionAttempt,
executionInfo.DecisionStartedTimestamp,
executionInfo.DecisionScheduledTimestamp,
executionInfo.DecisionOriginalScheduledTimestamp,
executionInfo.CancelRequested,
executionInfo.CancelRequestID,
executionInfo.StickyTaskList,
Expand Down Expand Up @@ -499,7 +498,6 @@ func createExecution(
executionInfo.DecisionAttempt,
executionInfo.DecisionStartedTimestamp,
executionInfo.DecisionScheduledTimestamp,
executionInfo.DecisionOriginalScheduledTimestamp,
executionInfo.CancelRequested,
executionInfo.CancelRequestID,
executionInfo.StickyTaskList,
Expand Down Expand Up @@ -607,7 +605,6 @@ func updateExecution(
executionInfo.DecisionAttempt,
executionInfo.DecisionStartedTimestamp,
executionInfo.DecisionScheduledTimestamp,
executionInfo.DecisionOriginalScheduledTimestamp,
executionInfo.CancelRequested,
executionInfo.CancelRequestID,
executionInfo.StickyTaskList,
Expand Down Expand Up @@ -681,7 +678,6 @@ func updateExecution(
executionInfo.DecisionAttempt,
executionInfo.DecisionStartedTimestamp,
executionInfo.DecisionScheduledTimestamp,
executionInfo.DecisionOriginalScheduledTimestamp,
executionInfo.CancelRequested,
executionInfo.CancelRequestID,
executionInfo.StickyTaskList,
Expand Down Expand Up @@ -1726,8 +1722,6 @@ func createWorkflowExecutionInfo(
info.DecisionStartedTimestamp = v.(int64)
case "decision_scheduled_timestamp":
info.DecisionScheduledTimestamp = v.(int64)
case "decision_original_scheduled_timestamp":
info.DecisionOriginalScheduledTimestamp = v.(int64)
case "cancel_requested":
info.CancelRequested = v.(bool)
case "cancel_request_id":
Expand Down
85 changes: 42 additions & 43 deletions common/persistence/dataInterfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,49 +226,48 @@ type (

// WorkflowExecutionInfo describes a workflow execution
WorkflowExecutionInfo struct {
DomainID string
WorkflowID string
RunID string
ParentDomainID string
ParentWorkflowID string
ParentRunID string
InitiatedID int64
CompletionEventBatchID int64
CompletionEvent *workflow.HistoryEvent
TaskList string
WorkflowTypeName string
WorkflowTimeout int32
DecisionTimeoutValue int32
ExecutionContext []byte
State int
CloseStatus int
LastFirstEventID int64
LastEventTaskID int64
NextEventID int64
LastProcessedEvent int64
StartTimestamp time.Time
LastUpdatedTimestamp time.Time
CreateRequestID string
SignalCount int32
DecisionVersion int64
DecisionScheduleID int64
DecisionStartedID int64
DecisionRequestID string
DecisionTimeout int32
DecisionAttempt int64
DecisionStartedTimestamp int64
DecisionScheduledTimestamp int64
DecisionOriginalScheduledTimestamp int64
CancelRequested bool
CancelRequestID string
StickyTaskList string
StickyScheduleToStartTimeout int32
ClientLibraryVersion string
ClientFeatureVersion string
ClientImpl string
AutoResetPoints *workflow.ResetPoints
Memo map[string][]byte
SearchAttributes map[string][]byte
DomainID string
WorkflowID string
RunID string
ParentDomainID string
ParentWorkflowID string
ParentRunID string
InitiatedID int64
CompletionEventBatchID int64
CompletionEvent *workflow.HistoryEvent
TaskList string
WorkflowTypeName string
WorkflowTimeout int32
DecisionTimeoutValue int32
ExecutionContext []byte
State int
CloseStatus int
LastFirstEventID int64
LastEventTaskID int64
NextEventID int64
LastProcessedEvent int64
StartTimestamp time.Time
LastUpdatedTimestamp time.Time
CreateRequestID string
SignalCount int32
DecisionVersion int64
DecisionScheduleID int64
DecisionStartedID int64
DecisionRequestID string
DecisionTimeout int32
DecisionAttempt int64
DecisionStartedTimestamp int64
DecisionScheduledTimestamp int64
CancelRequested bool
CancelRequestID string
StickyTaskList string
StickyScheduleToStartTimeout int32
ClientLibraryVersion string
ClientFeatureVersion string
ClientImpl string
AutoResetPoints *workflow.ResetPoints
Memo map[string][]byte
SearchAttributes map[string][]byte
// for retry
Attempt int32
HasRetryPolicy bool
Expand Down
216 changes: 107 additions & 109 deletions common/persistence/executionStore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,60 +117,59 @@ func (m *executionManagerImpl) DeserializeExecutionInfo(
newInfo := &WorkflowExecutionInfo{
CompletionEvent: completionEvent,

DomainID: info.DomainID,
WorkflowID: info.WorkflowID,
RunID: info.RunID,
ParentDomainID: info.ParentDomainID,
ParentWorkflowID: info.ParentWorkflowID,
ParentRunID: info.ParentRunID,
InitiatedID: info.InitiatedID,
CompletionEventBatchID: info.CompletionEventBatchID,
TaskList: info.TaskList,
WorkflowTypeName: info.WorkflowTypeName,
WorkflowTimeout: info.WorkflowTimeout,
DecisionTimeoutValue: info.DecisionTimeoutValue,
ExecutionContext: info.ExecutionContext,
State: info.State,
CloseStatus: info.CloseStatus,
LastFirstEventID: info.LastFirstEventID,
LastEventTaskID: info.LastEventTaskID,
NextEventID: info.NextEventID,
LastProcessedEvent: info.LastProcessedEvent,
StartTimestamp: info.StartTimestamp,
LastUpdatedTimestamp: info.LastUpdatedTimestamp,
CreateRequestID: info.CreateRequestID,
SignalCount: info.SignalCount,
DecisionVersion: info.DecisionVersion,
DecisionScheduleID: info.DecisionScheduleID,
DecisionStartedID: info.DecisionStartedID,
DecisionRequestID: info.DecisionRequestID,
DecisionTimeout: info.DecisionTimeout,
DecisionAttempt: info.DecisionAttempt,
DecisionStartedTimestamp: info.DecisionStartedTimestamp,
DecisionScheduledTimestamp: info.DecisionScheduledTimestamp,
DecisionOriginalScheduledTimestamp: info.DecisionOriginalScheduledTimestamp,
CancelRequested: info.CancelRequested,
CancelRequestID: info.CancelRequestID,
StickyTaskList: info.StickyTaskList,
StickyScheduleToStartTimeout: info.StickyScheduleToStartTimeout,
ClientLibraryVersion: info.ClientLibraryVersion,
ClientFeatureVersion: info.ClientFeatureVersion,
ClientImpl: info.ClientImpl,
Attempt: info.Attempt,
HasRetryPolicy: info.HasRetryPolicy,
InitialInterval: info.InitialInterval,
BackoffCoefficient: info.BackoffCoefficient,
MaximumInterval: info.MaximumInterval,
ExpirationTime: info.ExpirationTime,
MaximumAttempts: info.MaximumAttempts,
NonRetriableErrors: info.NonRetriableErrors,
EventStoreVersion: info.EventStoreVersion,
BranchToken: info.BranchToken,
CronSchedule: info.CronSchedule,
ExpirationSeconds: info.ExpirationSeconds,
AutoResetPoints: autoResetPoints,
SearchAttributes: info.SearchAttributes,
Memo: info.Memo,
DomainID: info.DomainID,
WorkflowID: info.WorkflowID,
RunID: info.RunID,
ParentDomainID: info.ParentDomainID,
ParentWorkflowID: info.ParentWorkflowID,
ParentRunID: info.ParentRunID,
InitiatedID: info.InitiatedID,
CompletionEventBatchID: info.CompletionEventBatchID,
TaskList: info.TaskList,
WorkflowTypeName: info.WorkflowTypeName,
WorkflowTimeout: info.WorkflowTimeout,
DecisionTimeoutValue: info.DecisionTimeoutValue,
ExecutionContext: info.ExecutionContext,
State: info.State,
CloseStatus: info.CloseStatus,
LastFirstEventID: info.LastFirstEventID,
LastEventTaskID: info.LastEventTaskID,
NextEventID: info.NextEventID,
LastProcessedEvent: info.LastProcessedEvent,
StartTimestamp: info.StartTimestamp,
LastUpdatedTimestamp: info.LastUpdatedTimestamp,
CreateRequestID: info.CreateRequestID,
SignalCount: info.SignalCount,
DecisionVersion: info.DecisionVersion,
DecisionScheduleID: info.DecisionScheduleID,
DecisionStartedID: info.DecisionStartedID,
DecisionRequestID: info.DecisionRequestID,
DecisionTimeout: info.DecisionTimeout,
DecisionAttempt: info.DecisionAttempt,
DecisionStartedTimestamp: info.DecisionStartedTimestamp,
DecisionScheduledTimestamp: info.DecisionScheduledTimestamp,
CancelRequested: info.CancelRequested,
CancelRequestID: info.CancelRequestID,
StickyTaskList: info.StickyTaskList,
StickyScheduleToStartTimeout: info.StickyScheduleToStartTimeout,
ClientLibraryVersion: info.ClientLibraryVersion,
ClientFeatureVersion: info.ClientFeatureVersion,
ClientImpl: info.ClientImpl,
Attempt: info.Attempt,
HasRetryPolicy: info.HasRetryPolicy,
InitialInterval: info.InitialInterval,
BackoffCoefficient: info.BackoffCoefficient,
MaximumInterval: info.MaximumInterval,
ExpirationTime: info.ExpirationTime,
MaximumAttempts: info.MaximumAttempts,
NonRetriableErrors: info.NonRetriableErrors,
EventStoreVersion: info.EventStoreVersion,
BranchToken: info.BranchToken,
CronSchedule: info.CronSchedule,
ExpirationSeconds: info.ExpirationSeconds,
AutoResetPoints: autoResetPoints,
SearchAttributes: info.SearchAttributes,
Memo: info.Memo,
}
newStats := &ExecutionStats{
HistorySize: info.HistorySize,
Expand Down Expand Up @@ -428,61 +427,60 @@ func (m *executionManagerImpl) SerializeExecutionInfo(
}

return &InternalWorkflowExecutionInfo{
DomainID: info.DomainID,
WorkflowID: info.WorkflowID,
RunID: info.RunID,
ParentDomainID: info.ParentDomainID,
ParentWorkflowID: info.ParentWorkflowID,
ParentRunID: info.ParentRunID,
InitiatedID: info.InitiatedID,
CompletionEventBatchID: info.CompletionEventBatchID,
CompletionEvent: completionEvent,
TaskList: info.TaskList,
WorkflowTypeName: info.WorkflowTypeName,
WorkflowTimeout: info.WorkflowTimeout,
DecisionTimeoutValue: info.DecisionTimeoutValue,
ExecutionContext: info.ExecutionContext,
State: info.State,
CloseStatus: info.CloseStatus,
LastFirstEventID: info.LastFirstEventID,
LastEventTaskID: info.LastEventTaskID,
NextEventID: info.NextEventID,
LastProcessedEvent: info.LastProcessedEvent,
StartTimestamp: info.StartTimestamp,
LastUpdatedTimestamp: info.LastUpdatedTimestamp,
CreateRequestID: info.CreateRequestID,
SignalCount: info.SignalCount,
DecisionVersion: info.DecisionVersion,
DecisionScheduleID: info.DecisionScheduleID,
DecisionStartedID: info.DecisionStartedID,
DecisionRequestID: info.DecisionRequestID,
DecisionTimeout: info.DecisionTimeout,
DecisionAttempt: info.DecisionAttempt,
DecisionStartedTimestamp: info.DecisionStartedTimestamp,
DecisionScheduledTimestamp: info.DecisionScheduledTimestamp,
DecisionOriginalScheduledTimestamp: info.DecisionOriginalScheduledTimestamp,
CancelRequested: info.CancelRequested,
CancelRequestID: info.CancelRequestID,
StickyTaskList: info.StickyTaskList,
StickyScheduleToStartTimeout: info.StickyScheduleToStartTimeout,
ClientLibraryVersion: info.ClientLibraryVersion,
ClientFeatureVersion: info.ClientFeatureVersion,
ClientImpl: info.ClientImpl,
AutoResetPoints: resetPoints,
Attempt: info.Attempt,
HasRetryPolicy: info.HasRetryPolicy,
InitialInterval: info.InitialInterval,
BackoffCoefficient: info.BackoffCoefficient,
MaximumInterval: info.MaximumInterval,
ExpirationTime: info.ExpirationTime,
MaximumAttempts: info.MaximumAttempts,
NonRetriableErrors: info.NonRetriableErrors,
EventStoreVersion: info.EventStoreVersion,
BranchToken: info.BranchToken,
CronSchedule: info.CronSchedule,
ExpirationSeconds: info.ExpirationSeconds,
Memo: info.Memo,
SearchAttributes: info.SearchAttributes,
DomainID: info.DomainID,
WorkflowID: info.WorkflowID,
RunID: info.RunID,
ParentDomainID: info.ParentDomainID,
ParentWorkflowID: info.ParentWorkflowID,
ParentRunID: info.ParentRunID,
InitiatedID: info.InitiatedID,
CompletionEventBatchID: info.CompletionEventBatchID,
CompletionEvent: completionEvent,
TaskList: info.TaskList,
WorkflowTypeName: info.WorkflowTypeName,
WorkflowTimeout: info.WorkflowTimeout,
DecisionTimeoutValue: info.DecisionTimeoutValue,
ExecutionContext: info.ExecutionContext,
State: info.State,
CloseStatus: info.CloseStatus,
LastFirstEventID: info.LastFirstEventID,
LastEventTaskID: info.LastEventTaskID,
NextEventID: info.NextEventID,
LastProcessedEvent: info.LastProcessedEvent,
StartTimestamp: info.StartTimestamp,
LastUpdatedTimestamp: info.LastUpdatedTimestamp,
CreateRequestID: info.CreateRequestID,
SignalCount: info.SignalCount,
DecisionVersion: info.DecisionVersion,
DecisionScheduleID: info.DecisionScheduleID,
DecisionStartedID: info.DecisionStartedID,
DecisionRequestID: info.DecisionRequestID,
DecisionTimeout: info.DecisionTimeout,
DecisionAttempt: info.DecisionAttempt,
DecisionStartedTimestamp: info.DecisionStartedTimestamp,
DecisionScheduledTimestamp: info.DecisionScheduledTimestamp,
CancelRequested: info.CancelRequested,
CancelRequestID: info.CancelRequestID,
StickyTaskList: info.StickyTaskList,
StickyScheduleToStartTimeout: info.StickyScheduleToStartTimeout,
ClientLibraryVersion: info.ClientLibraryVersion,
ClientFeatureVersion: info.ClientFeatureVersion,
ClientImpl: info.ClientImpl,
AutoResetPoints: resetPoints,
Attempt: info.Attempt,
HasRetryPolicy: info.HasRetryPolicy,
InitialInterval: info.InitialInterval,
BackoffCoefficient: info.BackoffCoefficient,
MaximumInterval: info.MaximumInterval,
ExpirationTime: info.ExpirationTime,
MaximumAttempts: info.MaximumAttempts,
NonRetriableErrors: info.NonRetriableErrors,
EventStoreVersion: info.EventStoreVersion,
BranchToken: info.BranchToken,
CronSchedule: info.CronSchedule,
ExpirationSeconds: info.ExpirationSeconds,
Memo: info.Memo,
SearchAttributes: info.SearchAttributes,

// attributes which are not related to mutable state
HistorySize: stats.HistorySize,
Expand Down
Loading

0 comments on commit 8d01472

Please sign in to comment.