Improve poolmanager concurrency handling with virtual capacity (#2737)
* add functionality to wait for specialization by keeping track of incoming requests * format executor package * fix required capacity to specialise new pod condition * move handling concurrency logic into pool cache from executor * remove unused methods and structs * implement queue in to store the svc wait * create a queue struct and its methods to handle concurrent inputs * use newly created queue to store waiting for svc requests * add waiting requests in queue and use them when a svc is ready * set function to request in queue if the context is still alive * remove concurrency approach to set svc for waiting requests * update the active requests whenever requests from pool are assigned a svc * add doc to define why the conditions exist * remove unwanted params in strcut and clean up code * set error while getting svc value if sum of specialization in progress and specialized is only more than concurrency limit * remove duplicate functions and unnecessary values in struct * close svc channel on set value and create constants for default concurrency and rpp * get next value in queue in case context is timed out for fetched value * remove specializationInProgress counter from pool cache * return in case the queue is empty wihle setting func to svc * test getSvcVaue and setSvcValue in poolcache * add unit tests for GetConcurrent and GetRequestsPerPod methods * reorder imports * add fuzzy testing for getSVCValue and setSVCValue in poolcache * restructure go mod file and update pool cache test cases * Add tests and bug fixes * refactor code and add test cases * add svcWaiting check while setting svc value --------- Signed-off-by: Sanket Sudake <sanketsudake@gmail.com> Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Pranoy Kumar Kundu
co-authored by
Sanket Sudake
Sanket Sudake
parent
b622f13ab6
commit
715ef8267e
@@ -2,11 +2,17 @@ package fscache
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
|
||||
ferror "github.com/fission/fission/pkg/error"
|
||||
"github.com/fission/fission/pkg/utils/loggerfactory"
|
||||
)
|
||||
|
||||
@@ -21,18 +27,44 @@ func TestPoolCache(t *testing.T) {
|
||||
defer cancel()
|
||||
logger := loggerfactory.GetLogger()
|
||||
c := NewPoolCache(logger)
|
||||
concurrency := 5
|
||||
requestsPerPod := 2
|
||||
|
||||
// should return err since no svc is present
|
||||
_, err := c.GetSvcValue(ctx, "func", requestsPerPod, concurrency)
|
||||
if err == nil {
|
||||
log.Panicf("found value when expected it to be nil")
|
||||
}
|
||||
|
||||
c.SetSvcValue(ctx, "func", "ip", &FuncSvc{
|
||||
Name: "value",
|
||||
}, resource.MustParse("45m"))
|
||||
}, resource.MustParse("45m"), 10)
|
||||
|
||||
// should not return any error since we added a svc
|
||||
_, err = c.GetSvcValue(ctx, "func", requestsPerPod, concurrency)
|
||||
checkErr(err)
|
||||
|
||||
c.SetSvcValue(ctx, "func", "ip", &FuncSvc{
|
||||
Name: "value",
|
||||
}, resource.MustParse("45m"), 10)
|
||||
|
||||
// should return err since all functions are busy
|
||||
_, err = c.GetSvcValue(ctx, "func", requestsPerPod, concurrency)
|
||||
if err == nil {
|
||||
log.Panicf("found value when expected it to be nil")
|
||||
}
|
||||
|
||||
c.SetSvcValue(ctx, "func", "ip", &FuncSvc{
|
||||
Name: "value",
|
||||
}, resource.MustParse("45m"), 10)
|
||||
|
||||
c.SetSvcValue(ctx, "func2", "ip2", &FuncSvc{
|
||||
Name: "value2",
|
||||
}, resource.MustParse("50m"))
|
||||
}, resource.MustParse("50m"), 10)
|
||||
|
||||
c.SetSvcValue(ctx, "func2", "ip22", &FuncSvc{
|
||||
Name: "value22",
|
||||
}, resource.MustParse("33m"))
|
||||
}, resource.MustParse("33m"), 10)
|
||||
|
||||
checkErr(c.DeleteValue(ctx, "func2", "ip2"))
|
||||
|
||||
@@ -43,30 +75,126 @@ func TestPoolCache(t *testing.T) {
|
||||
|
||||
c.MarkAvailable("func", "ip")
|
||||
|
||||
_, active, err := c.GetSvcValue(ctx, "func", 5)
|
||||
if active != 1 {
|
||||
log.Panicln("Expected 1 active, found", active)
|
||||
}
|
||||
checkErr(err)
|
||||
|
||||
checkErr(c.DeleteValue(ctx, "func", "ip"))
|
||||
|
||||
_, _, err = c.GetSvcValue(ctx, "func", 5)
|
||||
_, err = c.GetSvcValue(ctx, "func", requestsPerPod, concurrency)
|
||||
if err == nil {
|
||||
log.Panicf("found deleted element")
|
||||
}
|
||||
|
||||
c.SetSvcValue(ctx, "cpulimit", "100", &FuncSvc{
|
||||
Name: "value",
|
||||
}, resource.MustParse("3m"))
|
||||
}, resource.MustParse("3m"), 10)
|
||||
c.SetCPUUtilization("cpulimit", "100", resource.MustParse("4m"))
|
||||
|
||||
_, _, err = c.GetSvcValue(ctx, "cpulimit", 5)
|
||||
|
||||
if err == nil {
|
||||
log.Panicf("received pod address with higher CPU usage than limit")
|
||||
}
|
||||
c.SetCPUUtilization("cpulimit", "100", resource.MustParse("2m"))
|
||||
_, _, err = c.GetSvcValue(ctx, "cpulimit", 5)
|
||||
checkErr(err)
|
||||
}
|
||||
|
||||
func TestPoolCacheRequests(t *testing.T) {
|
||||
|
||||
type structForTest struct {
|
||||
name string
|
||||
requests int
|
||||
concurrency int
|
||||
rpp int
|
||||
simultaneous int
|
||||
failedRequests int
|
||||
}
|
||||
|
||||
for _, tt := range []structForTest{
|
||||
{
|
||||
name: "test1",
|
||||
requests: 1,
|
||||
concurrency: 1,
|
||||
rpp: 1,
|
||||
},
|
||||
{
|
||||
name: "test2",
|
||||
requests: 2,
|
||||
concurrency: 2,
|
||||
rpp: 1,
|
||||
},
|
||||
{
|
||||
name: "test3",
|
||||
requests: 300,
|
||||
concurrency: 5,
|
||||
rpp: 60,
|
||||
},
|
||||
|
||||
{
|
||||
name: "test4",
|
||||
requests: 6,
|
||||
concurrency: 1,
|
||||
rpp: 5,
|
||||
failedRequests: 1,
|
||||
},
|
||||
{
|
||||
name: "test5",
|
||||
requests: 6,
|
||||
concurrency: 5,
|
||||
rpp: 1,
|
||||
failedRequests: 1,
|
||||
},
|
||||
{
|
||||
name: "test6",
|
||||
requests: 300,
|
||||
concurrency: 5,
|
||||
rpp: 60,
|
||||
simultaneous: 30,
|
||||
},
|
||||
{
|
||||
name: "test7",
|
||||
requests: 310,
|
||||
concurrency: 5,
|
||||
rpp: 60,
|
||||
simultaneous: 30,
|
||||
failedRequests: 10,
|
||||
},
|
||||
{
|
||||
name: "test8",
|
||||
requests: 10,
|
||||
concurrency: 10,
|
||||
rpp: 1,
|
||||
simultaneous: 10,
|
||||
},
|
||||
} {
|
||||
t.Run(fmt.Sprintf("scenario-%s", tt.name), func(t *testing.T) {
|
||||
var failedRequests, svcCounter uint64
|
||||
p := NewPoolCache(loggerfactory.GetLogger())
|
||||
wg := sync.WaitGroup{}
|
||||
simultaneous := tt.simultaneous
|
||||
if simultaneous == 0 {
|
||||
simultaneous = 1
|
||||
}
|
||||
for i := 1; i <= tt.requests; i++ {
|
||||
wg.Add(1)
|
||||
go func(reqno int) {
|
||||
defer wg.Done()
|
||||
svc, err := p.GetSvcValue(context.Background(), "func", tt.rpp, tt.concurrency)
|
||||
if err != nil {
|
||||
code, _ := ferror.GetHTTPError(err)
|
||||
if code == http.StatusNotFound {
|
||||
p.SetSvcValue(context.Background(), "func", fmt.Sprintf("svc-%d", svcCounter), &FuncSvc{
|
||||
Name: "value",
|
||||
}, resource.MustParse("45m"), tt.rpp)
|
||||
atomic.AddUint64(&svcCounter, 1)
|
||||
} else {
|
||||
t.Log(reqno, "=>", err)
|
||||
atomic.AddUint64(&failedRequests, 1)
|
||||
}
|
||||
} else {
|
||||
if svc == nil {
|
||||
t.Log(reqno, "=>", "svc is nil")
|
||||
atomic.AddUint64(&failedRequests, 1)
|
||||
}
|
||||
}
|
||||
}(i)
|
||||
if i%simultaneous == 0 {
|
||||
wg.Wait()
|
||||
}
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
require.Equal(t, tt.failedRequests, int(atomic.LoadUint64(&failedRequests)))
|
||||
require.Equal(t, tt.concurrency, int(atomic.LoadUint64(&svcCounter)))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user