ar: return error from hooks if occured

This commit is contained in:
Nick Ethier 2019-01-18 18:09:38 -05:00
parent b840a2eb7b
commit 47127de671
No known key found for this signature in database
GPG Key ID: 07C1A3ECED90D24A
2 changed files with 2 additions and 2 deletions

View File

@ -249,7 +249,7 @@ func (ar *allocRunner) destroy() error {
}
}
return nil
return merr.ErrorOrNil()
}
// shutdownHooks calls graceful shutdown hooks for when the agent is exiting.

View File

@ -32,7 +32,7 @@ type allocRunnerMutableState08 struct {
// 0.8.
//
// https://github.com/hashicorp/nomad/blob/v0.8.6/client/task_runner.go#L188-L197
//
// COMPAT(0.10): Allows upgrading from 0.8.X to 0.9.0.
type taskRunnerState08 struct {
Version string
HandleID string