internal/{server,cli}: Attempt to forcefully cancel a job

.changelog/3102.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: Introduce a `-force` flag to attempt to force cancel a job
+```

internal/cli/job_cancel.go

@@ -1,6 +1,8 @@
 package cli
 
 import (
+ "time"
+
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
 
@@ -13,7 +15,7 @@ import (
 type JobCancelCommand struct {
  *baseCommand
 
- flagJson bool
+ flagForce bool
 }
 
 func (c *JobCancelCommand) Run(args []string) int {
@@ -35,6 +37,15 @@ func (c *JobCancelCommand) Run(args []string) int {
  jobId = c.args[0]
  }
 
+ if c.flagForce {
+ c.ui.Output("You requested to use force to cancel a job! Be aware that this "+
+ "operation is dangerous and could result in some bad behavior or failure modes in Waypoint.",
+ terminal.WithWarningStyle())
+ c.ui.Output("If this is not your intention, ctrl-c now! The CLI will sleep for 3 seconds...",
+ terminal.WithWarningStyle())
+ time.Sleep(3 * time.Second)
+ }
+
  sg := c.ui.StepGroup()
  defer sg.Wait()
 
@@ -43,6 +54,7 @@ func (c *JobCancelCommand) Run(args []string) int {
 
  _, err := c.project.Client().CancelJob(ctx, &pb.CancelJobRequest{
  JobId: jobId,
+ Force: c.flagForce,
  })
  if err != nil {
  s.Update("Failed to marked job %q for cancellation", jobId)
@@ -59,14 +71,29 @@ func (c *JobCancelCommand) Run(args []string) int {
  return 1
  }
 
- s.Update("Marked job %q for cancellation", jobId)
+ if !c.flagForce {
+ s.Update("Marked job %q for cancellation", jobId)
+ } else {
+ s.Update("Forcefully marked job %q for cancellation", jobId)
+ s.Status(terminal.StatusWarn)
+ }
  s.Done()
 
  return 0
 }
 
 func (c *JobCancelCommand) Flags() *flag.Sets {
  return c.flagSet(flagSetOperation, func(set *flag.Sets) {
+ f := set.NewSet("Command Options")
+ f.BoolVar(&flag.BoolVar{
+ Name: "dangerously-force",
+ Target: &c.flagForce,
+ Default: false,
+ Usage: "Will forcefully cancel the job. This will immediately mark the " +
+ "job as complete in the server, regardless of the real job status. This " +
+ "may leave dangling resources or cause concurrency issues if the underlying " +
+ "job doesn't gracefully cancel. USE WITH CAUTION.",
+ })
  })
 }
 

internal/server/singleprocess/service_job.go

@@ -56,7 +56,7 @@ func (s *service) CancelJob(
  ctx context.Context,
  req *pb.CancelJobRequest,
 ) (*empty.Empty, error) {
- if err := s.state.JobCancel(req.JobId, false); err != nil {
+ if err := s.state.JobCancel(req.JobId, req.Force); err != nil {
  return nil, err
  }