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

Delete Namespace: send delete executions heartbeats from separate go routine #6986

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −5
Open

Delete Namespace: send delete executions heartbeats from separate go routine #6986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 27 additions & 3 deletions service/worker/deletenamespace/deleteexecutions/activities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package deleteexecutions

import (
"context"
"time"

"go.temporal.io/api/serviceerror"
workflowpb "go.temporal.io/api/workflow/v1"
Expand Down Expand Up @@ -126,10 +127,29 @@ func (a *LocalActivities) GetNextPageTokenActivity(ctx context.Context, params G
func (a *Activities) DeleteExecutionsActivity(ctx context.Context, params DeleteExecutionsActivityParams) (DeleteExecutionsActivityResult, error) {
ctx = headers.SetCallerName(ctx, params.Namespace.String())

rateLimiter := quotas.NewRateLimiter(float64(params.RPS), params.RPS)
progressCh := make(chan DeleteExecutionsActivityResult, 1)
defer func() { close(progressCh) }()

go func() {
heartbeatTicker := time.NewTicker(deleteWorkflowExecutionsActivityOptions.HeartbeatTimeout / 2)
defer heartbeatTicker.Stop()

var lastKnownProgress DeleteExecutionsActivityResult
for {
select {
case progress, chOpen := <-progressCh:
if !chOpen {
// Stop heartbeating when a channel is closed, i.e., activity is completed.
return
}
lastKnownProgress = progress
case <-heartbeatTicker.C:
activity.RecordHeartbeat(ctx, lastKnownProgress)
}
}
}()

var result DeleteExecutionsActivityResult

req := &manager.ListWorkflowExecutionsRequestV2{
NamespaceID: params.NamespaceID,
Namespace: params.Namespace,
Expand All @@ -143,6 +163,7 @@ func (a *Activities) DeleteExecutionsActivity(ctx context.Context, params Delete
a.logger.Error("Unable to list all workflow executions.", tag.WorkflowNamespace(params.Namespace.String()), tag.Error(err))
return result, err
}
rateLimiter := quotas.NewRateLimiter(float64(params.RPS), params.RPS)
for _, execution := range resp.Executions {
err = rateLimiter.Wait(ctx)
if err != nil {
Expand Down Expand Up @@ -175,11 +196,14 @@ func (a *Activities) DeleteExecutionsActivity(ctx context.Context, params Delete
metrics.DeleteExecutionFailuresCount.With(a.metricsHandler).Record(1)
a.logger.Error("Unable to delete workflow execution.", tag.WorkflowNamespace(params.Namespace.String()), tag.WorkflowID(execution.Execution.GetWorkflowId()), tag.WorkflowRunID(execution.Execution.GetRunId()), tag.Error(err))
}
activity.RecordHeartbeat(ctx, result)
select {
case progressCh <- result:
// Send the current result to heartbeat go routine.
case <-ctx.Done():
// Stop deletion on cancellation.
return result, ctx.Err()
default:
// Don't block deletion if a progress channel is full.
}
}
return result, nil
Expand Down
3 changes: 1 addition & 2 deletions service/worker/deletenamespace/reclaimresources/workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ var (
}

deleteExecutionsWorkflowOptions = workflow.ChildWorkflowOptions{
RetryPolicy: retryPolicy,
WorkflowRunTimeout: 60 * time.Minute,
RetryPolicy: retryPolicy,
}

ensureNoExecutionsActivityRetryPolicy = &temporal.RetryPolicy{
Expand Down
Loading