Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use informer for time trigger handling with multiple namespace support (#2593)

Browse Source 
* changes to add informer in timer for time trigger
* Refactor timer trigger handlers and remove unwanted code

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Shubham Bansal
2022-11-02 16:08:48 +05:30
committed by GitHub
co-authored by Sanket Sudake
parent c33842c94c
commit b9fa6ca20a
3 changed files with 78 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/timer/timer.go
+9 -81
View File
@@ -21,7 +21,6 @@ import (
"go.uber.org/zap"
fv1 "github.com/fission/fission/pkg/apis/core/v1"
"github.com/fission/fission/pkg/crd"
"github.com/fission/fission/pkg/publisher"
"github.com/fission/fission/pkg/utils"
)
@@ -34,20 +33,11 @@ const (
type (
Timer struct {
logger *zap.Logger
triggers map[string]*timerTriggerWithCron
requestChannel chan *timerRequest
publisher *publisher.Publisher
logger *zap.Logger
triggers map[string]*timerTriggerWithCron
publisher *publisher.Publisher
}
timerRequest struct {
requestType
triggers []fv1.TimeTrigger
responseChannel chan *timerResponse
}
timerResponse struct {
error
}
timerTriggerWithCron struct {
trigger fv1.TimeTrigger
cron *cron.Cron
@@ -56,88 +46,26 @@ type (
func MakeTimer(logger *zap.Logger, publisher publisher.Publisher) *Timer {
timer := &Timer{
logger: logger.Named("timer"),
triggers: make(map[string]*timerTriggerWithCron),
requestChannel: make(chan *timerRequest),
publisher: &publisher,
logger: logger.Named("timer"),
triggers: make(map[string]*timerTriggerWithCron),
publisher: &publisher,
}
go timer.svc()
return timer
}
func (timer *Timer) Sync(triggers []fv1.TimeTrigger) error {
req := &timerRequest{
requestType: SYNC,
triggers: triggers,
responseChannel: make(chan *timerResponse),
}
timer.requestChannel <- req
resp := <-req.responseChannel
return resp.error
}
func (timer *Timer) svc() {
for {
req := <-timer.requestChannel
switch req.requestType {
case SYNC:
err := timer.syncCron(req.triggers)
req.responseChannel <- &timerResponse{error: err}
}
}
}
func (timer *Timer) syncCron(triggers []fv1.TimeTrigger) error {
// add new triggers or update existing ones
triggerMap := make(map[string]bool)
for _, t := range triggers {
triggerMap[crd.CacheKey(&t.ObjectMeta)] = true
if item, ok := timer.triggers[crd.CacheKey(&t.ObjectMeta)]; ok {
// update cron if the cron spec changed
if item.trigger.Spec.Cron != t.Spec.Cron {
// if there is an cron running, stop it
if item.cron != nil {
item.cron.Stop()
}
item.cron = timer.newCron(t)
}
item.trigger = t
} else {
timer.triggers[crd.CacheKey(&t.ObjectMeta)] = &timerTriggerWithCron{
trigger: t,
cron: timer.newCron(t),
}
}
}
// process removed triggers
for k, v := range timer.triggers {
if _, found := triggerMap[k]; !found {
if v.cron != nil {
v.cron.Stop()
timer.logger.Info("cron for time trigger stopped", zap.String("trigger", v.trigger.ObjectMeta.Name))
}
delete(timer.triggers, k)
}
}
return nil
}
func (timer *Timer) newCron(t fv1.TimeTrigger) *cron.Cron {
c := cron.New()
c.AddFunc(t.Spec.Cron, func() { //nolint: errCheck
headers := map[string]string{
"X-Fission-Timer-Name": t.ObjectMeta.Name,
"X-Fission-Timer-Name": t.Name,
}
// with the addition of multi-tenancy, the users can create functions in any namespace. however,
// the triggers can only be created in the same namespace as the function.
// so essentially, function namespace = trigger namespace.
(*timer.publisher).Publish("", headers, utils.UrlForFunction(t.Spec.FunctionReference.Name, t.ObjectMeta.Namespace))
(*timer.publisher).Publish("", headers, utils.UrlForFunction(t.Spec.FunctionReference.Name, t.Namespace))
})
c.Start()
timer.logger.Info("added new cron for time trigger", zap.String("trigger", t.ObjectMeta.Name))
timer.logger.Info("started cron for time trigger", zap.String("trigger_name", t.Name), zap.String("trigger_namespace", t.Namespace), zap.String("cron", t.Spec.Cron))
return c
}