Fix router panic when trying to update route (#811)

This commit is contained in:
Ta-Ching Chen
2018-08-05 01:06:47 +08:00
committed by GitHub
parent 088e665d28
commit 27b74a7cf2
+20
View File
@@ -49,6 +49,7 @@ type HTTPTriggerSet struct {
functions []crd.Function functions []crd.Function
funcStore k8sCache.Store funcStore k8sCache.Store
funcController k8sCache.Controller funcController k8sCache.Controller
updateRouterRequestChannel chan struct{}
tsRoundTripperParams *tsRoundTripperParams tsRoundTripperParams *tsRoundTripperParams
} }
@@ -62,6 +63,7 @@ func makeHTTPTriggerSet(fmap *functionServiceMap, fissionClient *crd.FissionClie
kubeClient: kubeClient, kubeClient: kubeClient,
executor: executor, executor: executor,
crdClient: crdClient, crdClient: crdClient,
updateRouterRequestChannel: make(chan struct{}),
tsRoundTripperParams: params, tsRoundTripperParams: params,
} }
var tStore, fnStore k8sCache.Store var tStore, fnStore k8sCache.Store
@@ -87,6 +89,7 @@ func (ts *HTTPTriggerSet) subscribeRouter(ctx context.Context, mr *mutableRouter
log.Printf("Skipping continuous trigger updates") log.Printf("Skipping continuous trigger updates")
return return
} }
go ts.updateRouter()
go ts.runWatcher(ctx, ts.funcController) go ts.runWatcher(ctx, ts.funcController)
go ts.runWatcher(ctx, ts.triggerController) go ts.runWatcher(ctx, ts.triggerController)
} }
@@ -192,6 +195,11 @@ func (ts *HTTPTriggerSet) initTriggerController() (k8sCache.Store, k8sCache.Cont
UpdateFunc: func(oldObj interface{}, newObj interface{}) { UpdateFunc: func(oldObj interface{}, newObj interface{}) {
oldTrigger := oldObj.(*crd.HTTPTrigger) oldTrigger := oldObj.(*crd.HTTPTrigger)
newTrigger := newObj.(*crd.HTTPTrigger) newTrigger := newObj.(*crd.HTTPTrigger)
if oldTrigger.Metadata.ResourceVersion == newTrigger.Metadata.ResourceVersion {
return
}
go updateIngress(oldTrigger, newTrigger, ts.kubeClient) go updateIngress(oldTrigger, newTrigger, ts.kubeClient)
ts.syncTriggers() ts.syncTriggers()
}, },
@@ -211,7 +219,13 @@ func (ts *HTTPTriggerSet) initFunctionController() (k8sCache.Store, k8sCache.Con
ts.syncTriggers() ts.syncTriggers()
}, },
UpdateFunc: func(oldObj interface{}, newObj interface{}) { UpdateFunc: func(oldObj interface{}, newObj interface{}) {
oldFn := oldObj.(*crd.Function)
fn := newObj.(*crd.Function) fn := newObj.(*crd.Function)
if oldFn.Metadata.ResourceVersion == fn.Metadata.ResourceVersion {
return
}
// update resolver function reference cache // update resolver function reference cache
for key, rr := range ts.resolver.copy() { for key, rr := range ts.resolver.copy() {
if key.functionReference.Name == fn.Metadata.Name && if key.functionReference.Name == fn.Metadata.Name &&
@@ -236,6 +250,11 @@ func (ts *HTTPTriggerSet) runWatcher(ctx context.Context, controller k8sCache.Co
} }
func (ts *HTTPTriggerSet) syncTriggers() { func (ts *HTTPTriggerSet) syncTriggers() {
ts.updateRouterRequestChannel <- struct{}{}
}
func (ts *HTTPTriggerSet) updateRouter() {
for range ts.updateRouterRequestChannel {
// get triggers // get triggers
latestTriggers := ts.triggerStore.List() latestTriggers := ts.triggerStore.List()
triggers := make([]crd.HTTPTrigger, len(latestTriggers)) triggers := make([]crd.HTTPTrigger, len(latestTriggers))
@@ -255,3 +274,4 @@ func (ts *HTTPTriggerSet) syncTriggers() {
// make a new router and use it // make a new router and use it
ts.mutableRouter.updateRouter(ts.getRouter()) ts.mutableRouter.updateRouter(ts.getRouter())
} }
}