fix(client): acknowledge signals after process exit
This commit is contained in:
1 parent
789342ab4f
commit
30e7bb8545
7 files changed
+465
-8
No files matched your search
@@ -324,24 +324,37 @@ func (executor *Executor) appendStdinAck(ctx context.Context, issue domain.UUID,
|
||||
}
|
||||
|
||||
func (executor *Executor) Signal(ctx context.Context, _ Session, input *rvboxv1.SignalCommand) error {
|
||||
if input == nil {
|
||||
return errors.New("missing signal request")
|
||||
if input == nil || input.GetCommandRevision() == 0 || input.GetSignal() < rvboxv1.SignalKind_SIGNAL_HUP || input.GetSignal() > rvboxv1.SignalKind_SIGNAL_USR2 {
|
||||
return errors.New("invalid signal request")
|
||||
}
|
||||
issue, err := domain.ParseUUIDv7(input.GetIssueUuid())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
command, err := executor.Store.GetCommand(ctx, issue)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
reject := func(detail string) error {
|
||||
return executor.appendSignalResult(ctx, issue, input.GetCommandRevision(), input.GetSignal(), false, false, supervisor.SignalOutcome{}, errors.New(detail))
|
||||
}
|
||||
if command.Revision != input.GetCommandRevision() {
|
||||
return reject("signal revision does not match command")
|
||||
}
|
||||
executor.mu.Lock()
|
||||
process := executor.active[issue]
|
||||
executor.mu.Unlock()
|
||||
if process == nil {
|
||||
return errors.New("command is not running")
|
||||
if process == nil || command.Terminal {
|
||||
// A process can exit while its signal is queued or replayed. Persist a
|
||||
// command-local negative result so the server can retire the intent;
|
||||
// returning an error here would close/reconnect and replay it forever.
|
||||
return reject("command is not running")
|
||||
}
|
||||
kind := supervisor.SignalTerm
|
||||
if input.GetSignal() == rvboxv1.SignalKind_SIGNAL_KILL {
|
||||
kind = supervisor.SignalKill
|
||||
} else if input.GetSignal() != rvboxv1.SignalKind_SIGNAL_TERM {
|
||||
return errors.New("unsupported Windows signal")
|
||||
return reject("unsupported Windows signal")
|
||||
}
|
||||
outcome, err := executor.Supervisor.Signal(ctx, process, kind)
|
||||
if kind == supervisor.SignalKill || outcome.Escalated {
|
||||
@@ -349,15 +362,15 @@ func (executor *Executor) Signal(ctx context.Context, _ Session, input *rvboxv1.
|
||||
executor.forced[issue] = true
|
||||
executor.mu.Unlock()
|
||||
}
|
||||
return executor.appendSignalResult(ctx, issue, input.GetCommandRevision(), input.GetSignal(), err == nil && outcome.Delivered, outcome, err)
|
||||
return executor.appendSignalResult(ctx, issue, input.GetCommandRevision(), input.GetSignal(), err == nil && outcome.Delivered, true, outcome, err)
|
||||
}
|
||||
|
||||
func (executor *Executor) appendSignalResult(ctx context.Context, issue domain.UUID, revision uint64, signal rvboxv1.SignalKind, accepted bool, outcome supervisor.SignalOutcome, cause error) error {
|
||||
func (executor *Executor) appendSignalResult(ctx context.Context, issue domain.UUID, revision uint64, signal rvboxv1.SignalKind, accepted, attempted bool, outcome supervisor.SignalOutcome, cause error) error {
|
||||
detail := outcome.Detail
|
||||
if cause != nil {
|
||||
detail = boundedError(cause)
|
||||
}
|
||||
payload, err := proto.MarshalOptions{Deterministic: true}.Marshal(&rvboxv1.CommandEvent{IssueUuid: issue.String(), ObservedAt: timestamppb.New(executor.Now()), Payload: &rvboxv1.CommandEvent_SignalResult{SignalResult: &rvboxv1.SignalResult{Signal: signal, Accepted: accepted, GracefulDeliveryAttempted: signal == rvboxv1.SignalKind_SIGNAL_TERM, ForcedTerminationUsed: outcome.Escalated || signal == rvboxv1.SignalKind_SIGNAL_KILL, Detail: detail, CommandRevision: revision}}})
|
||||
payload, err := proto.MarshalOptions{Deterministic: true}.Marshal(&rvboxv1.CommandEvent{IssueUuid: issue.String(), ObservedAt: timestamppb.New(executor.Now()), Payload: &rvboxv1.CommandEvent_SignalResult{SignalResult: &rvboxv1.SignalResult{Signal: signal, Accepted: accepted, GracefulDeliveryAttempted: attempted && signal == rvboxv1.SignalKind_SIGNAL_TERM, ForcedTerminationUsed: attempted && (outcome.Escalated || signal == rvboxv1.SignalKind_SIGNAL_KILL), Detail: detail, CommandRevision: revision}}})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user