Skip to content

Commit

Permalink
Merge pull request #10849 from benbuzbee/benbuz/fix-destroy
Browse files Browse the repository at this point in the history
Don't treat a failed recover + successful destroy as a successful recover
  • Loading branch information
schmichael authored and Mahmood Ali committed Jul 29, 2021
1 parent df693b4 commit af0b55e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/10849.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
drivers: Fixed bug where Nomad incorrectly reported tasks as recovered successfully even when they were not.
```
3 changes: 1 addition & 2 deletions client/allocrunner/taskrunner/task_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -1102,10 +1102,9 @@ func (tr *TaskRunner) restoreHandle(taskHandle *drivers.TaskHandle, net *drivers
"error", err, "task_id", taskHandle.Config.ID)
}

return false
}

return true
return false
}

// Update driver handle on task runner
Expand Down

0 comments on commit af0b55e

Please sign in to comment.