faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-21 00:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable DNS-RR override for task lookup.

Browse Source
This commit is contained in:
Alex Ellis
2017-04-05 08:21:33 +01:00
committed by Alex Ellis
parent a476c50a99
commit 0b166c7627
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gateway/handlers/proxy.go
View File

@ -5,11 +5,14 @@ import (
"context"
"fmt"
"io/ioutil"
"math/rand"
"net"
"net/http"
"strconv"
"time"
"os"
"github.com/Sirupsen/logrus"
"github.com/alexellis/faas/gateway/metrics"
"github.com/docker/docker/api/types"
@ -111,6 +114,11 @@ func copyHeaders(destination *http.Header, source *http.Header) {
}
}
func randomInt(min, max int) int {
rand.Seed(time.Now().Unix())
return rand.Intn(max-min) + min
}
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)
@ -121,15 +129,24 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
metrics.GatewayFunctionsHistogram.WithLabelValues(service).Observe(seconds)
}(time.Now())
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)
var dnsrr bool
if os.Getenv("dnsrr") == "true" {
dnsrr = true
}
watchdogPort := 8080
addr := service
// Use DNS-RR via tasks.servicename if enabled as override, otherwise VIP.
if dnsrr {
entries, lookupErr := net.LookupIP(fmt.Sprintf("tasks.%s", service))
if lookupErr == nil && len(entries) > 0 {
index := randomInt(0, len(entries))
addr = entries[index].String()
}
}
url := fmt.Sprintf("http://%s:%d/", addr, watchdogPort)
contentType := r.Header.Get("Content-Type")
fmt.Printf("[%s] Forwarding request [%s] to: %s\n", stamp, contentType, url)
@ -161,6 +178,7 @@ func invokeService(w http.ResponseWriter, r *http.Request, metrics metrics.Metri
clientHeader := w.Header()
copyHeaders(&clientHeader, &response.Header)
// TODO: copyHeaders removes the need for this line - test removal.
// Match header for strict services
w.Header().Set("Content-Type", r.Header.Get("Content-Type"))