mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-05 01:32:38 +00:00
Ignore errors when cancelling dataproc jobs (#3123)
<!-- This change is generated by MagicModules. --> /cc @rileykarson
This commit is contained in:
parent
3d36a173f3
commit
c94c35f437
|
@ -323,13 +323,11 @@ func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error {
|
||||||
if forceDelete {
|
if forceDelete {
|
||||||
log.Printf("[DEBUG] Attempting to first cancel Dataproc job %s if it's still running ...", d.Id())
|
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
|
// 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
|
// be cancelled. We do however wait for the state to be one that is
|
||||||
// at least not active
|
// at least not active
|
||||||
|
_, _ = config.clientDataproc.Projects.Regions.Jobs.Cancel(project, region, d.Id(), &dataproc.CancelJobRequest{}).Do()
|
||||||
|
|
||||||
waitErr := dataprocJobOperationWait(config, region, project, d.Id(),
|
waitErr := dataprocJobOperationWait(config, region, project, d.Id(),
|
||||||
"Cancelling Dataproc job", timeoutInMinutes, 1)
|
"Cancelling Dataproc job", timeoutInMinutes, 1)
|
||||||
if waitErr != nil {
|
if waitErr != nil {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user