Disable KeepAlive on proxy (#21)

* Service lookup

* Disable KeepAlive to force RR for replias.

* set KeepAlive to 0

* Remove temporary file

* Support white and rename function

* Remove debug from node sample
This commit is contained in:
Alex Ellis
2017-03-21 08:39:36 +00:00
committed by GitHub
parent 9cf4376096
commit 2aeadfda1c
9 changed files with 201 additions and 119 deletions

View File

@ -5,6 +5,7 @@ import (
"context"
"fmt"
"io/ioutil"
"net"
"net/http"
"strconv"
"time"
@ -20,6 +21,20 @@ import (
// MakeProxy creates a proxy for HTTP web requests which can be routed to a function.
func MakeProxy(metrics metrics.MetricOptions, wildcard bool, c *client.Client, logger *logrus.Logger) http.HandlerFunc {
proxyClient := http.Client{
Transport: &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{
Timeout: 3 * time.Second,
KeepAlive: 0,
}).DialContext,
MaxIdleConns: 1,
DisableKeepAlives: true,
IdleConnTimeout: 120 * time.Millisecond,
ExpectContinueTimeout: 1500 * time.Millisecond,
},
}
return func(w http.ResponseWriter, r *http.Request) {
if r.Method == "POST" {
@ -31,11 +46,11 @@ func MakeProxy(metrics metrics.MetricOptions, wildcard bool, c *client.Client, l
vars := mux.Vars(r)
name := vars["name"]
fmt.Println("invoke by name")
lookupInvoke(w, r, metrics, name, c, logger)
lookupInvoke(w, r, metrics, name, c, logger, &proxyClient)
defer r.Body.Close()
} else if len(header) > 0 {
lookupInvoke(w, r, metrics, header[0], c, logger)
lookupInvoke(w, r, metrics, header[0], c, logger, &proxyClient)
defer r.Body.Close()
} else {
w.WriteHeader(http.StatusBadRequest)
@ -59,7 +74,7 @@ func trackTime(then time.Time, metrics metrics.MetricOptions, name string) {
metrics.GatewayFunctionsHistogram.WithLabelValues(name).Observe(since.Seconds())
}
func lookupInvoke(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, name string, c *client.Client, logger *logrus.Logger) {
func lookupInvoke(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, name string, c *client.Client, logger *logrus.Logger, proxyClient *http.Client) {
exists, err := lookupSwarmService(name, c)
if err != nil || exists == false {
@ -75,7 +90,7 @@ func lookupInvoke(w http.ResponseWriter, r *http.Request, metrics metrics.Metric
if exists {
defer trackTime(time.Now(), metrics, name)
requestBody, _ := ioutil.ReadAll(r.Body)
invokeService(w, r, metrics, name, requestBody, logger)
invokeService(w, r, metrics, name, requestBody, logger, proxyClient)
}
}
@ -88,7 +103,7 @@ func lookupSwarmService(serviceName string, c *client.Client) (bool, error) {
return len(services) > 0, err
}
func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, service string, requestBody []byte, logger *logrus.Logger) {
func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.MetricOptions, service string, requestBody []byte, logger *logrus.Logger, proxyClient *http.Client) {
stamp := strconv.FormatInt(time.Now().Unix(), 10)
defer func(when time.Time) {
@ -98,9 +113,15 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
metrics.GatewayFunctionsHistogram.WithLabelValues(service).Observe(seconds)
}(time.Now())
// start := time.Now()
buf := bytes.NewBuffer(requestBody)
url := "http://" + service + ":" + strconv.Itoa(8080) + "/"
watchdogPort := 8080
addr, lookupErr := net.LookupIP(service)
var url string
if len(addr) > 0 && lookupErr == nil {
url = fmt.Sprintf("http://%s:%d/", addr[0].String(), watchdogPort)
} else {
url = fmt.Sprintf("http://%s:%d/", service, watchdogPort)
}
contentType := r.Header.Get("Content-Type")
if len(contentType) == 0 {
contentType = "text/plain"
@ -108,7 +129,11 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
fmt.Printf("[%s] Forwarding request [%s] to: %s\n", stamp, contentType, url)
response, err := http.Post(url, r.Header.Get("Content-Type"), buf)
request, err := http.NewRequest("POST", url, bytes.NewReader(requestBody))
request.Header.Add("Content-Type", contentType)
defer request.Body.Close()
response, err := proxyClient.Do(request)
if err != nil {
logger.Infoln(err)
writeHead(service, metrics, http.StatusInternalServerError, w)