Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Populate activitypause for activity heartbeat response #7098

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Populate activitypause for activity heartbeat response #7098

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c7ff38
Populate activitypause for activity heartbeat response
ychebotarev Jan 16, 2025
6ae0195
update go.mod to the latest api
ychebotarev Jan 16, 2025
f2763e3
update go.sum
ychebotarev Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,044 changes: 2,027 additions & 2,017 deletions api/historyservice/v1/request_response.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ require (
go.opentelemetry.io/otel/sdk v1.31.0
go.opentelemetry.io/otel/sdk/metric v1.31.0
go.opentelemetry.io/otel/trace v1.31.0
go.temporal.io/api v1.43.2-0.20250114194029-61f369a5f511
go.temporal.io/api v1.43.2-0.20250116211459-192e5ed816b7
go.temporal.io/sdk v1.31.0
go.temporal.io/version v0.3.0
go.uber.org/automaxprocs v1.5.3
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeX
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
go.temporal.io/api v1.43.2-0.20250114194029-61f369a5f511 h1:4YhvSVBPmEkNFE5wupUSXUx0+HotlAYjXyWqWfUCgqY=
go.temporal.io/api v1.43.2-0.20250114194029-61f369a5f511/go.mod h1:1WwYUMo6lao8yl0371xWUm13paHExN5ATYT/B7QtFis=
go.temporal.io/api v1.43.2-0.20250116211459-192e5ed816b7 h1:4lxYy+8G8UbjOCMMD2qa+QIdZZenP8MoylAPPmhx3CQ=
go.temporal.io/api v1.43.2-0.20250116211459-192e5ed816b7/go.mod h1:1WwYUMo6lao8yl0371xWUm13paHExN5ATYT/B7QtFis=
go.temporal.io/sdk v1.31.0 h1:CLYiP0R5Sdj0gq8LyYKDDz4ccGOdJPR8wNGJU0JGwj8=
go.temporal.io/sdk v1.31.0/go.mod h1:8U8H7rF9u4Hyb4Ry9yiEls5716DHPNvVITPNkgWUwE8=
go.temporal.io/version v0.3.0 h1:dMrei9l9NyHt8nG6EB8vAwDLLTwx2SvRyucCSumAiig=
Expand Down
2 changes: 2 additions & 0 deletions proto/internal/temporal/server/api/historyservice/v1/request_response.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@ message RecordActivityTaskHeartbeatRequest {

message RecordActivityTaskHeartbeatResponse {
bool cancel_requested = 1;

bool activity_paused = 2;
}

message RespondActivityTaskCompletedRequest {
Expand Down
10 changes: 8 additions & 2 deletions service/frontend/workflow_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,10 @@ func (wh *WorkflowHandler) RecordActivityTaskHeartbeat(ctx context.Context, requ
return nil, err
}

return &workflowservice.RecordActivityTaskHeartbeatResponse{CancelRequested: resp.GetCancelRequested()}, nil
return &workflowservice.RecordActivityTaskHeartbeatResponse{
CancelRequested: resp.GetCancelRequested(),
ActivityPaused: resp.GetActivityPaused(),
}, nil
}

// RecordActivityTaskHeartbeatById is called by application worker while it is processing an ActivityTask. If worker fails
Expand Down Expand Up @@ -1293,7 +1296,10 @@ func (wh *WorkflowHandler) RecordActivityTaskHeartbeatById(ctx context.Context,
if err != nil {
return nil, err
}
return &workflowservice.RecordActivityTaskHeartbeatByIdResponse{CancelRequested: resp.GetCancelRequested()}, nil
return &workflowservice.RecordActivityTaskHeartbeatByIdResponse{
CancelRequested: resp.GetCancelRequested(),
ActivityPaused: resp.GetActivityPaused(),
}, nil
}

// RespondActivityTaskCompleted is called by application worker when it is done processing an ActivityTask. It will
Expand Down
3 changes: 3 additions & 0 deletions service/history/api/recordactivitytaskheartbeat/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func Invoke(
}

var cancelRequested bool
var activityPaused bool
err = api.GetAndUpdateWorkflowWithNew(
ctx,
token.Clock,
Expand Down Expand Up @@ -104,6 +105,7 @@ func Invoke(
}

cancelRequested = ai.CancelRequested
activityPaused = ai.Paused

// Save progress and last HB reported time.
mutableState.UpdateActivityProgress(ai, request)
Expand All @@ -123,5 +125,6 @@ func Invoke(

return &historyservice.RecordActivityTaskHeartbeatResponse{
CancelRequested: cancelRequested,
ActivityPaused: activityPaused,
}, nil
}
Loading