Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deprecate allocrunner and promote allocrunnerv2 to allocrunner #4756

Merged
merged 7 commits into from
Oct 5, 2018
Merged

Deprecate allocrunner and promote allocrunnerv2 to allocrunner #4756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3d424e
move files around
dadgar Oct 4, 2018
6ce09fb
skip building deprecated files
dadgar Oct 4, 2018
3575715
fix test compiling
dadgar Oct 4, 2018
718017d
allocrunnerv2 -> allocrunner
dadgar Oct 4, 2018
ed4555f
more test fixes
dadgar Oct 4, 2018
43caeb3
compile on windows
dadgar Oct 4, 2018
47514ff
Fix lints
dadgar Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,374 changes: 370 additions & 1,004 deletions client/allocrunner/alloc_runner.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions client/allocrunnerv2/alloc_runner_hooks.go → client/allocrunner/alloc_runner_hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package allocrunnerv2
package allocrunner

import (
"context"
"fmt"
"time"

multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/nomad/client/allocrunnerv2/interfaces"
"github.com/hashicorp/nomad/client/allocrunner/interfaces"
"github.com/hashicorp/nomad/nomad/structs"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ func (ar *allocRunner) initRunnerHooks() {
hs := &allocHealthSetter{ar}

// Create the alloc directory hook. This is run first to ensure the
// directoy path exists for other hooks.
// directory path exists for other hooks.
ar.runnerHooks = []interfaces.RunnerHook{
newAllocDirHook(hookLogger, ar.allocDir),
newDiskMigrationHook(hookLogger, ar.prevAllocWatcher, ar.allocDir),
Expand Down
Loading