Skip to content

Commit 669f9cb

Browse files
author
Mahmood Ali
authored
Merge pull request #9304 from hashicorp/b-legacy-executors-are-executors
Legacy executors are executors after all
2 parents b3825e7 + dd7b6f0 commit 669f9cb

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ BUG FIXES:
4343
* config (Enterprise): Fixed default enterprise config merging. [[GH-9083](https://github.com/hashicorp/nomad/pull/9083)]
4444
* client: Fixed an issue with the Java fingerprinter on macOS causing pop-up notifications when no JVM installed. [[GH-9225](https://github.com/hashicorp/nomad/pull/9225)]
4545
* client: Fixed an fingerprinter issue detecting bridge kernel module [[GH-9299](https://github.com/hashicorp/nomad/pull/9299)]
46+
* client: Fixed an in-place upgrade bug, where a Nomad client may fail to manage tasks that were started with pre-0.9 Nomad client. [[GH-9304](https://github.com/hashicorp/nomad/pull/9304)]
4647
* consul: Fixed a bug to correctly validate task when using script-checks in group-level services [[GH-8952](https://github.com/hashicorp/nomad/issues/8952)]
4748
* consul: Fixed a bug where canary_meta was not being interpolated with environment variables [[GH-9096](https://github.com/hashicorp/nomad/pull/9096)]
4849
* consul/connect: Fixed a bug to correctly trigger updates on jobspec changes [[GH-9029](https://github.com/hashicorp/nomad/pull/9029)]

drivers/shared/executor/legacy_executor_wrapper.go

+8
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ type legacyExecutorWrapper struct {
3636
logger hclog.Logger
3737
}
3838

39+
// validate that legacyExecutorWrapper is an executor
40+
var _ Executor = (*legacyExecutorWrapper)(nil)
41+
3942
func (l *legacyExecutorWrapper) Launch(launchCmd *ExecCommand) (*ProcessState, error) {
4043
return nil, fmt.Errorf("operation not supported for legacy exec wrapper")
4144
}
@@ -133,6 +136,11 @@ func (l *legacyExecutorWrapper) Exec(deadline time.Time, cmd string, args []stri
133136
return l.client.Exec(deadline, cmd, args)
134137
}
135138

139+
func (l *legacyExecutorWrapper) ExecStreaming(ctx context.Context, cmd []string, tty bool,
140+
stream drivers.ExecTaskStream) error {
141+
return fmt.Errorf("operation not supported for legacy exec wrapper")
142+
}
143+
136144
type pre09ExecutorRPC struct {
137145
client *rpc.Client
138146
logger hclog.Logger

0 commit comments

Comments
 (0)