VishalandSoam Vasani
da820186f0
This change adds a layer of abstraction over poolmgr. Poolmgr is now just one of the ways to turn a function into a service; other implementations will be added. The executor abstraction is a uniform API over all these implementations. * Executor layer added on top of pool manager * Removed the external server for executor * Minor changes to keep existing semantics as much possible * Separating the executor vs. poolmgr backend functionality and associated data members * Executor logic separated from Poolmgr backend completely, placeholder for new backend * Changed references to poolmgr in tests * Moved poolmgr to it's package, as a side effect moved Cache to its's package (was causing cyclical dependency) and had to make some data structures exposed outside package * Rebased from master and changed references to tpr -> crd * Executor layer added on top of pool manager * Executor logic separated from Poolmgr backend completely, placeholder for new backend * Changed podName to a generic objectReference in fscache (#391) Changed podName to a generic objectReference in function service cache implementation. * Moved poolmgr to it's package, as a side effect moved Cache to its's package (was causing cyclical dependency) and had to make some data structures exposed outside package * Rebased from master and changed references to tpr -> crd * Merged from master with latest changes * Removed stale executor service & deployment from previous merge * Addressed review comments, still testing some areas
93 lines
2.7 KiB
Go
93 lines
2.7 KiB
Go
/*
|
|
Copyright 2016 The Fission Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
/*
|
|
|
|
This is the Fission Router package.
|
|
|
|
Its job is to:
|
|
|
|
1. Keep track of HTTP triggers and their mappings to functions
|
|
|
|
Use the controller API to get and watch this state.
|
|
|
|
2. Given a function, get a reference to a routable function run service
|
|
|
|
Use the ContainerPoolManager API to get a service backed by one
|
|
or more function run containers. The container(s) backing the
|
|
service may be newly created, or they might be reused. The only
|
|
requirement is that one or more containers backs the service.
|
|
|
|
3. Forward the request to the service, and send the response back.
|
|
|
|
Plain ol HTTP.
|
|
|
|
*/
|
|
|
|
package router
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log"
|
|
"net/http"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/gorilla/handlers"
|
|
"github.com/gorilla/mux"
|
|
|
|
"github.com/fission/fission/crd"
|
|
executorClient "github.com/fission/fission/executor/client"
|
|
)
|
|
|
|
// request url ---[mux]---> Function(name,uid) ----[fmap]----> k8s service url
|
|
|
|
// request url ---[trigger]---> Function(name, deployment) ----[deployment]----> Function(name, uid) ----[pool mgr]---> k8s service url
|
|
|
|
func router(ctx context.Context, httpTriggerSet *HTTPTriggerSet, resolver *functionReferenceResolver) *mutableRouter {
|
|
muxRouter := mux.NewRouter()
|
|
mr := NewMutableRouter(muxRouter)
|
|
httpTriggerSet.subscribeRouter(ctx, mr, resolver)
|
|
return mr
|
|
}
|
|
|
|
func serve(ctx context.Context, port int, httpTriggerSet *HTTPTriggerSet, resolver *functionReferenceResolver) {
|
|
mr := router(ctx, httpTriggerSet, resolver)
|
|
url := fmt.Sprintf(":%v", port)
|
|
http.ListenAndServe(url, handlers.LoggingHandler(os.Stdout, mr))
|
|
}
|
|
|
|
func Start(port int, executorUrl string) {
|
|
fmap := makeFunctionServiceMap(time.Minute)
|
|
|
|
fissionClient, _, _, err := crd.MakeFissionClient()
|
|
if err != nil {
|
|
log.Fatalf("Error connecting to kubernetes API: %v", err)
|
|
}
|
|
|
|
restClient := fissionClient.GetCrdClient()
|
|
|
|
executor := executorClient.MakeClient(executorUrl)
|
|
triggers, _, fnStore := makeHTTPTriggerSet(fmap, fissionClient, executor, restClient)
|
|
resolver := makeFunctionReferenceResolver(fnStore)
|
|
|
|
log.Printf("Starting router at port %v\n", port)
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
serve(ctx, port, triggers, resolver)
|
|
}
|