Retry with heartbeat progress (cadence-workflow#1091)

siathalysedI · Sep 7, 2018 · f805d2d · f805d2d
1 parent 63b5612
commit f805d2d
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 8 deletions.
diff --git a/.gen/go/history/idl.go b/.gen/go/history/idl.go
diff --git a/.gen/go/history/types.go b/.gen/go/history/types.go
diff --git a/.gen/go/shared/idl.go b/.gen/go/shared/idl.go
diff --git a/.gen/go/shared/types.go b/.gen/go/shared/types.go
diff --git a/idl/github.com/uber/cadence/history.thrift b/idl/github.com/uber/cadence/history.thrift
@@ -134,6 +134,7 @@ struct RecordActivityTaskStartedResponse {
   30: optional i64 (js.type = "Long") startedTimestamp
   40: optional i64 (js.type = "Long") attempt
   50: optional i64 (js.type = "Long") scheduledTimestampOfThisAttempt
+  60: optional binary heartbeatDetails
 }
 
 struct RecordDecisionTaskStartedRequest {

diff --git a/idl/github.com/uber/cadence/shared.thrift b/idl/github.com/uber/cadence/shared.thrift
@@ -939,6 +939,7 @@ struct PollForActivityTaskResponse {
   110: optional i32 heartbeatTimeoutSeconds
   120: optional i32 attempt
   130: optional i64 (js.type = "Long") scheduledTimestampOfThisAttempt
+  140: optional binary heartbeatDetails
 }
 
 struct RecordActivityTaskHeartbeatRequest {

diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -908,6 +908,7 @@ func (e *historyEngineImpl) RecordActivityTaskStarted(ctx context.Context,
 
 			response.StartedTimestamp = common.Int64Ptr(ai.StartedTime.UnixNano())
 			response.Attempt = common.Int64Ptr(int64(ai.Attempt))
+			response.HeartbeatDetails = ai.Details
 
 			// Start a timer for the activity task.
 			timerTasks := []persistence.Task{}

diff --git a/service/matching/matchingEngine.go b/service/matching/matchingEngine.go
@@ -605,6 +605,7 @@ func (e *matchingEngineImpl) createPollForActivityTaskResponse(context *taskCont
 
 	response.TaskToken, _ = e.tokenSerializer.Serialize(token)
 	response.Attempt = common.Int32Ptr(int32(token.ScheduleAttempt))
+	response.HeartbeatDetails = historyResponse.HeartbeatDetails
 	return response
 }