From c94c35f4373e53805869b96aa4c7b7c56c750072 Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 26 Feb 2019 10:46:45 -0800 Subject: [PATCH] Ignore errors when cancelling dataproc jobs (#3123) /cc @rileykarson --- google/resource_dataproc_job.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/google/resource_dataproc_job.go b/google/resource_dataproc_job.go index d714313e..5b90079d 100644 --- a/google/resource_dataproc_job.go +++ b/google/resource_dataproc_job.go @@ -323,13 +323,11 @@ func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error { if forceDelete { log.Printf("[DEBUG] Attempting to first cancel Dataproc job %s if it's still running ...", d.Id()) - if _, err := config.clientDataproc.Projects.Regions.Jobs.Cancel( - project, region, d.Id(), &dataproc.CancelJobRequest{}).Do(); err != nil { - return fmt.Errorf("Error canceling job: %v", err) - } // ignore error if we get one - job may be finished already and not need to // be cancelled. We do however wait for the state to be one that is // at least not active + _, _ = config.clientDataproc.Projects.Regions.Jobs.Cancel(project, region, d.Id(), &dataproc.CancelJobRequest{}).Do() + waitErr := dataprocJobOperationWait(config, region, project, d.Id(), "Cancelling Dataproc job", timeoutInMinutes, 1) if waitErr != nil {