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

Allow min-scale

Browse Source 
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis
2017-11-29 21:58:11 +00:00
parent 12c5f4926e
commit 2452fdea0b
6 changed files with 105 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gateway/plugin/external.go
View File

@ -10,6 +10,7 @@ import (
"net"
"net/http"
"net/url"
"strconv"
"time"
"fmt"
@ -48,10 +49,8 @@ type ExternalServiceQuery struct {
ProxyClient http.Client
}
const maxReplicas = 40
// GetReplicas replica count for function
func (s ExternalServiceQuery) GetReplicas(serviceName string) (uint64, uint64, error) {
func (s ExternalServiceQuery) GetReplicas(serviceName string) (uint64, uint64, uint64, error) {
var err error
function := requests.Function{}
@ -73,9 +72,34 @@ func (s ExternalServiceQuery) GetReplicas(serviceName string) (uint64, uint64, e
}
}
max := uint64(maxReplicas)
maxReplicas := uint64(handlers.DefaultMaxReplicas)
minReplicas := uint64(1)
return function.Replicas, max, err
if function.Labels != nil {
labels := *function.Labels
minScale := labels["com.openfaas.scale.min"]
maxScale := labels["com.openfaas.scale.max"]
if len(minScale) > 0 {
labelValue, err := strconv.Atoi(minScale)
if err != nil {
log.Printf("Bad replica count: %s, should be uint", minScale)
} else {
minReplicas = uint64(labelValue)
}
}
if len(maxScale) > 0 {
labelValue, err := strconv.Atoi(maxScale)
if err != nil {
log.Printf("Bad replica count: %s, should be uint", maxScale)
} else {
maxReplicas = uint64(labelValue)
}
}
}
return function.Replicas, maxReplicas, minReplicas, err
}
// ScaleServiceRequest request scaling of replica
@ -103,10 +127,12 @@ func (s ExternalServiceQuery) SetReplicas(serviceName string, count uint64) erro
defer req.Body.Close()
res, err := s.ProxyClient.Do(req)
defer res.Body.Close()
if err != nil {
log.Println(urlPath, err)
} else {
if res.Body != nil {
defer res.Body.Close()
}
}
if res.StatusCode != http.StatusOK {