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

Store CurrentFlowStatus as a value rather than reference #1013

Merged
merged 2 commits into from
Jan 7, 2024
Merged

Store CurrentFlowStatus as a value rather than reference #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23d50ce
Store CurrentFlowStatus as a value rather than reference
iskakaushik Jan 7, 2024
10bd882
more fixes
iskakaushik Jan 7, 2024
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 changes: 2 additions & 2 deletions flow/cmd/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ func (h *FlowRequestHandler) FlowStateChange(
}
if req.RequestedFlowState == protos.FlowStatus_STATUS_PAUSED &&
*currState == protos.FlowStatus_STATUS_RUNNING {
err = h.updateWorkflowStatus(ctx, workflowID, protos.FlowStatus_STATUS_PAUSING.Enum())
err = h.updateWorkflowStatus(ctx, workflowID, protos.FlowStatus_STATUS_PAUSING)
if err != nil {
return nil, err
}
Expand All @@ -468,7 +468,7 @@ func (h *FlowRequestHandler) FlowStateChange(
)
} else if req.RequestedFlowState == protos.FlowStatus_STATUS_TERMINATED &&
(*currState == protos.FlowStatus_STATUS_RUNNING || *currState == protos.FlowStatus_STATUS_PAUSED) {
err = h.updateWorkflowStatus(ctx, workflowID, protos.FlowStatus_STATUS_TERMINATING.Enum())
err = h.updateWorkflowStatus(ctx, workflowID, protos.FlowStatus_STATUS_TERMINATING)
if err != nil {
return nil, err
}
Expand Down
6 changes: 4 additions & 2 deletions flow/cmd/mirror_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,10 @@ func (h *FlowRequestHandler) getWorkflowStatus(ctx context.Context, workflowID s
return state, nil
}

func (h *FlowRequestHandler) updateWorkflowStatus(ctx context.Context,
workflowID string, state *protos.FlowStatus,
func (h *FlowRequestHandler) updateWorkflowStatus(
ctx context.Context,
workflowID string,
state protos.FlowStatus,
) error {
_, err := h.temporalClient.UpdateWorkflow(ctx, workflowID, "", shared.FlowStatusUpdate, state)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion flow/e2e/test_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func SetupCDCFlowStatusQuery(env *testsuite.TestWorkflowEnvironment,
slog.Error(err.Error())
}

if *state.CurrentFlowState == protos.FlowStatus_STATUS_RUNNING {
if state.CurrentFlowState == protos.FlowStatus_STATUS_RUNNING {
break
}
} else {
Expand Down
20 changes: 10 additions & 10 deletions flow/workflows/cdc_flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type CDCFlowWorkflowState struct {
// Needed to support schema changes.
RelationMessageMapping model.RelationMessageMapping
// current workflow state
CurrentFlowState *protos.FlowStatus
CurrentFlowState protos.FlowStatus
}

type SignalProps struct {
Expand All @@ -72,7 +72,7 @@ func NewCDCFlowWorkflowState() *CDCFlowWorkflowState {
RelationName: "protobuf_workaround",
},
},
CurrentFlowState: protos.FlowStatus_STATUS_SETUP.Enum(),
CurrentFlowState: protos.FlowStatus_STATUS_SETUP,
}
}

Expand Down Expand Up @@ -171,13 +171,13 @@ func CDCFlowWorkflowWithConfig(
if err != nil {
return state, fmt.Errorf("failed to set `%s` query handler: %w", shared.CDCFlowStateQuery, err)
}
err = workflow.SetQueryHandler(ctx, shared.FlowStatusQuery, func() (*protos.FlowStatus, error) {
err = workflow.SetQueryHandler(ctx, shared.FlowStatusQuery, func() (protos.FlowStatus, error) {
return state.CurrentFlowState, nil
})
if err != nil {
return state, fmt.Errorf("failed to set `%s` query handler: %w", shared.FlowStatusQuery, err)
}
err = workflow.SetUpdateHandler(ctx, shared.FlowStatusUpdate, func(status *protos.FlowStatus) error {
err = workflow.SetUpdateHandler(ctx, shared.FlowStatusUpdate, func(status protos.FlowStatus) error {
state.CurrentFlowState = status
return nil
})
Expand All @@ -193,7 +193,7 @@ func CDCFlowWorkflowWithConfig(
// because Resync modifies TableMappings before Setup and also before Snapshot
// for safety, rely on the idempotency of SetupFlow instead
// also, no signals are being handled until the loop starts, so no PAUSE/DROP will take here.
if state.CurrentFlowState != protos.FlowStatus_STATUS_RUNNING.Enum() {
if state.CurrentFlowState != protos.FlowStatus_STATUS_RUNNING {
// if resync is true, alter the table name schema mapping to temporarily add
// a suffix to the table names.
if cfg.Resync {
Expand Down Expand Up @@ -223,7 +223,7 @@ func CDCFlowWorkflowWithConfig(
if err := setupFlowFuture.Get(setupFlowCtx, &cfg); err != nil {
return state, fmt.Errorf("failed to execute child workflow: %w", err)
}
state.CurrentFlowState = protos.FlowStatus_STATUS_SNAPSHOT.Enum()
state.CurrentFlowState = protos.FlowStatus_STATUS_SNAPSHOT

// next part of the setup is to snapshot-initial-copy and setup replication slots.
snapshotFlowID, err := GetChildWorkflowID(ctx, "snapshot-flow", cfg.FlowJobName)
Expand Down Expand Up @@ -285,7 +285,7 @@ func CDCFlowWorkflowWithConfig(
}
}

state.CurrentFlowState = protos.FlowStatus_STATUS_RUNNING.Enum()
state.CurrentFlowState = protos.FlowStatus_STATUS_RUNNING
state.Progress = append(state.Progress, "executed setup flow and snapshot flow")

// if initial_copy_only is opted for, we end the flow here.
Expand Down Expand Up @@ -333,7 +333,7 @@ func CDCFlowWorkflowWithConfig(

if state.ActiveSignal == shared.PauseSignal {
startTime := time.Now()
state.CurrentFlowState = protos.FlowStatus_STATUS_PAUSED.Enum()
state.CurrentFlowState = protos.FlowStatus_STATUS_PAUSED
signalChan := workflow.GetSignalChannel(ctx, shared.CDCFlowSignalName)
var signalVal shared.CDCFlowSignal

Expand All @@ -352,11 +352,11 @@ func CDCFlowWorkflowWithConfig(
// check if the peer flow has been shutdown
if state.ActiveSignal == shared.ShutdownSignal {
w.logger.Info("peer flow has been shutdown")
state.CurrentFlowState = protos.FlowStatus_STATUS_TERMINATED.Enum()
state.CurrentFlowState = protos.FlowStatus_STATUS_TERMINATED
return state, nil
}

state.CurrentFlowState = protos.FlowStatus_STATUS_RUNNING.Enum()
state.CurrentFlowState = protos.FlowStatus_STATUS_RUNNING

// check if total sync flows have been completed
// since this happens immediately after we check for signals, the case of a signal being missed
Expand Down
Loading