mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
6a7973e6b6
the mqs are storing a models.Task, which was not incorporating all the fields that are in a task.Config. I would very much like to merge these two things, but expect to do this in a future restructuring as both are used widely and not cordoned off properly (Config has a channel, stdin, stdout, stderr -- and isn't just a 'config', so to speak, as Task is). Since a task.Config is what is used to actually run a container, the result of the aforementioned deficiency was #193 where tasks are improperly configured and ran (namely, memory wrong). async tasks can still not be hot, they will be reverted to default format. would also like to fix this (also part of restructuring). I actually started doing this, hence the changes to those files (the surface area of the change is small and discourages improper future use, so I've left what I've done). this will: closes #193 closes #195 closes #154 removes many unused fields in models.Task, since we have not implemented retries. priority & delay are left, even though they are not used either, the main goal of this is to resolve #193 and both these fields are strongly plumbed into all the mqs, so punting on those two.
75 lines
1.5 KiB
Go
75 lines
1.5 KiB
Go
package protocol
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httputil"
|
|
"time"
|
|
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/fnproject/fn/api/runner/task"
|
|
)
|
|
|
|
// HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant
|
|
// communication. It relies on Content-Length to know when to stop reading from
|
|
// containers stdout. It also mandates valid HTTP headers back and forth, thus
|
|
// returning errors in case of parsing problems.
|
|
type HTTPProtocol struct {
|
|
in io.Writer
|
|
out io.Reader
|
|
}
|
|
|
|
func (p *HTTPProtocol) IsStreamable() bool {
|
|
return true
|
|
}
|
|
|
|
func (p *HTTPProtocol) Dispatch(ctx context.Context, cfg *task.Config) error {
|
|
var retErr error
|
|
done := make(chan struct{})
|
|
go func() {
|
|
// TODO not okay. plumb content-length from req into cfg..
|
|
var body bytes.Buffer
|
|
io.Copy(&body, cfg.Stdin)
|
|
req, err := http.NewRequest("GET", "/", &body)
|
|
if err != nil {
|
|
retErr = err
|
|
return
|
|
}
|
|
for k, v := range cfg.Env {
|
|
req.Header.Set(k, v)
|
|
}
|
|
req.Header.Set("Content-Length", fmt.Sprint(body.Len()))
|
|
req.Header.Set("Task-ID", cfg.ID)
|
|
raw, err := httputil.DumpRequest(req, true)
|
|
if err != nil {
|
|
retErr = err
|
|
return
|
|
}
|
|
p.in.Write(raw)
|
|
|
|
res, err := http.ReadResponse(bufio.NewReader(p.out), req)
|
|
if err != nil {
|
|
retErr = err
|
|
return
|
|
}
|
|
|
|
io.Copy(cfg.Stdout, res.Body)
|
|
done <- struct{}{}
|
|
}()
|
|
|
|
timeout := time.After(cfg.Timeout)
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
case <-timeout:
|
|
return models.ErrRunnerTimeout
|
|
case <-done:
|
|
return retErr
|
|
}
|
|
}
|