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

Publish to multiple topics

Browse Source 
Enables publishing to various topics according to annotations
on the functions. The function cache is moved up one level so
that it can be shared between the scale from zero code and the
queue proxy.

Unit tests added for new internal methods.

Tested e2e with arkade and the newest queue-worker and RC
gateway image with two queues and an annotation on one of the
functions of com.openfaas.queue. It worked as expected including
with multiple namespace support.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2020-04-22 11:46:06 +01:00
committed by Alex Ellis
parent a7c6c39200
commit 2bfca6d848
22 changed files with 264 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gateway/scaling/function_cache.go
View File

@ -8,17 +8,10 @@ import (
"time"
)
// FunctionMeta holds the last refresh and any other
// meta-data needed for caching.
type FunctionMeta struct {
LastRefresh time.Time
ServiceQueryResponse ServiceQueryResponse
}
// Expired find out whether the cache item has expired with
// the given expiry duration from when it was stored.
func (fm *FunctionMeta) Expired(expiry time.Duration) bool {
return time.Now().After(fm.LastRefresh.Add(expiry))
// FunctionCacher queries functions and caches the results
type FunctionCacher interface {
Set(functionName, namespace string, serviceQueryResponse ServiceQueryResponse)
Get(functionName, namespace string) (ServiceQueryResponse, bool)
}
// FunctionCache provides a cache of Function replica counts
@ -28,8 +21,16 @@ type FunctionCache struct {
Sync sync.RWMutex
}
// NewFunctionCache creates a function cache to query function metadata
func NewFunctionCache(cacheExpiry time.Duration) FunctionCacher {
return &FunctionCache{
Cache: make(map[string]*FunctionMeta),
Expiry: cacheExpiry,
}
}
// Set replica count for functionName
func (fc *FunctionCache) Set(functionName, namespace string, serviceQueryResponse ServiceQueryResponse) {
func (fc *FunctionCache) Set(functionName, namespace string, queryRes ServiceQueryResponse) {
fc.Sync.Lock()
defer fc.Sync.Unlock()
@ -38,14 +39,12 @@ func (fc *FunctionCache) Set(functionName, namespace string, serviceQueryRespons
}
fc.Cache[functionName+"."+namespace].LastRefresh = time.Now()
fc.Cache[functionName+"."+namespace].ServiceQueryResponse = serviceQueryResponse
// entry.LastRefresh = time.Now()
// entry.ServiceQueryResponse = serviceQueryResponse
fc.Cache[functionName+"."+namespace].ServiceQueryResponse = queryRes
}
// Get replica count for functionName
func (fc *FunctionCache) Get(functionName, namespace string) (ServiceQueryResponse, bool) {
replicas := ServiceQueryResponse{
queryRes := ServiceQueryResponse{
AvailableReplicas: 0,
}
@ -54,9 +53,9 @@ func (fc *FunctionCache) Get(functionName, namespace string) (ServiceQueryRespon
defer fc.Sync.RUnlock()
if val, exists := fc.Cache[functionName+"."+namespace]; exists {
replicas = val.ServiceQueryResponse
queryRes = val.ServiceQueryResponse
hit = !val.Expired(fc.Expiry)
}
return replicas, hit
return queryRes, hit
}