-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #325 from mesos/jdef_executor_sender
executor: Sender API support, updated example-executor
- Loading branch information
Showing
16 changed files
with
516 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
api/v1/lib/executor/calls/calls_generated.go → .../executor/calls/calls_caller_generated.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| package calls | ||
|
|
||
| // go generate -import github.com/mesos/mesos-go/api/v1/lib/executor -type C:executor.Call -type O:executor.CallOpt -output calls_sender_generated.go | ||
| // GENERATED CODE FOLLOWS; DO NOT EDIT. | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/mesos/mesos-go/api/v1/lib" | ||
| "github.com/mesos/mesos-go/api/v1/lib/encoding" | ||
|
|
||
| "github.com/mesos/mesos-go/api/v1/lib/executor" | ||
| ) | ||
|
|
||
| type ( | ||
| // Request generates a Call that's sent to a Mesos agent. Subsequent invocations are expected to | ||
| // yield equivalent calls. Intended for use w/ non-streaming requests to an agent. | ||
| Request interface { | ||
| Call() *executor.Call | ||
| } | ||
|
|
||
| // RequestFunc is the functional adaptation of Request. | ||
| RequestFunc func() *executor.Call | ||
|
|
||
| // RequestStreaming generates a Call that's send to a Mesos agent. Subsequent invocations MAY generate | ||
| // different Call objects. No more Call objects are expected once a nil is returned to signal the end of | ||
| // of the request stream. | ||
| RequestStreaming interface { | ||
| Request | ||
| IsStreaming() | ||
| } | ||
|
|
||
| // RequestStreamingFunc is the functional adaptation of RequestStreaming. | ||
| RequestStreamingFunc func() *executor.Call | ||
|
|
||
| // Send issues a Request to a Mesos agent and properly manages Call-specific mechanics. | ||
| Sender interface { | ||
| Send(context.Context, Request) (mesos.Response, error) | ||
| } | ||
|
|
||
| // SenderFunc is the functional adaptation of the Sender interface | ||
| SenderFunc func(context.Context, Request) (mesos.Response, error) | ||
| ) | ||
|
|
||
| func (f RequestFunc) Call() *executor.Call { return f() } | ||
|
|
||
| func (f RequestFunc) Marshaler() encoding.Marshaler { | ||
| // avoid returning (*executor.Call)(nil) for interface type | ||
| if call := f(); call != nil { | ||
| return call | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (f RequestStreamingFunc) Push(c ...*executor.Call) RequestStreamingFunc { return Push(f, c...) } | ||
|
|
||
| func (f RequestStreamingFunc) Marshaler() encoding.Marshaler { | ||
| // avoid returning (*executor.Call)(nil) for interface type | ||
| if call := f(); call != nil { | ||
| return call | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (f RequestStreamingFunc) IsStreaming() {} | ||
|
|
||
| func (f RequestStreamingFunc) Call() *executor.Call { return f() } | ||
|
|
||
| // Push prepends one or more calls onto a request stream. If no calls are given then the original stream is returned. | ||
| func Push(r RequestStreaming, c ...*executor.Call) RequestStreamingFunc { | ||
| return func() *executor.Call { | ||
| if len(c) == 0 { | ||
| return r.Call() | ||
| } | ||
| head := c[0] | ||
| c = c[1:] | ||
| return head | ||
| } | ||
| } | ||
|
|
||
| // Empty generates a stream that always returns nil. | ||
| func Empty() RequestStreamingFunc { return func() *executor.Call { return nil } } | ||
|
|
||
| var ( | ||
| _ = Request(RequestFunc(nil)) | ||
| _ = RequestStreaming(RequestStreamingFunc(nil)) | ||
| _ = Sender(SenderFunc(nil)) | ||
| ) | ||
|
|
||
| // NonStreaming returns a RequestFunc that always generates the same Call. | ||
| func NonStreaming(c *executor.Call) RequestFunc { return func() *executor.Call { return c } } | ||
|
|
||
| // FromChan returns a streaming request that fetches calls from the given channel until it closes. | ||
| // If a nil chan is specified then the returned func will always generate nil. | ||
| func FromChan(ch <-chan *executor.Call) RequestStreamingFunc { | ||
| if ch == nil { | ||
| // avoid blocking forever if we're handed a nil chan | ||
| return func() *executor.Call { return nil } | ||
| } | ||
| return func() *executor.Call { | ||
| if m, ok := <-ch; ok { | ||
| return m | ||
| } | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // Send implements the Sender interface for SenderFunc | ||
| func (f SenderFunc) Send(ctx context.Context, r Request) (mesos.Response, error) { | ||
| return f(ctx, r) | ||
| } | ||
|
|
||
| // IgnoreResponse generates a sender that closes any non-nil response received by Mesos. | ||
| func IgnoreResponse(s Sender) SenderFunc { | ||
| return func(ctx context.Context, r Request) (mesos.Response, error) { | ||
| resp, err := s.Send(ctx, r) | ||
| if resp != nil { | ||
| resp.Close() | ||
| } | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| // SendNoData is a convenience func that executes the given Call using the provided Sender | ||
| // and always drops the response data. | ||
| func SendNoData(ctx context.Context, sender Sender, r Request) (err error) { | ||
| _, err = IgnoreResponse(sender).Send(ctx, r) | ||
| return | ||
| } | ||
|
|
||
| // SendWith injects the given options for all calls. | ||
| func SenderWith(s Sender, opts ...executor.CallOpt) SenderFunc { | ||
| if len(opts) == 0 { | ||
| return s.Send | ||
| } | ||
| return func(ctx context.Context, r Request) (mesos.Response, error) { | ||
| f := func() (c *executor.Call) { | ||
| if c = r.Call(); c != nil { | ||
| c = c.With(opts...) | ||
| } | ||
| return | ||
| } | ||
| switch r.(type) { | ||
| case RequestStreaming: | ||
| return s.Send(ctx, RequestStreamingFunc(f)) | ||
| default: | ||
| return s.Send(ctx, RequestFunc(f)) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.