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
115 lines
2.5 KiB
Go
115 lines
2.5 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.
|
|
*/
|
|
|
|
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"log"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/fission/fission"
|
|
)
|
|
|
|
type Client struct {
|
|
executorUrl string
|
|
tappedByUrl map[string]bool
|
|
requestChan chan string
|
|
}
|
|
|
|
func MakeClient(executorUrl string) *Client {
|
|
c := &Client{
|
|
executorUrl: strings.TrimSuffix(executorUrl, "/"),
|
|
tappedByUrl: make(map[string]bool),
|
|
requestChan: make(chan string),
|
|
}
|
|
go c.service()
|
|
return c
|
|
}
|
|
|
|
func (c *Client) GetServiceForFunction(metadata *metav1.ObjectMeta) (string, error) {
|
|
executorUrl := c.executorUrl + "/v2/getServiceForFunction"
|
|
|
|
body, err := json.Marshal(metadata)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
resp, err := http.Post(executorUrl, "application/json", bytes.NewReader(body))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != 200 {
|
|
return "", fission.MakeErrorFromHTTP(resp)
|
|
}
|
|
|
|
svcName, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return string(svcName), nil
|
|
}
|
|
|
|
func (c *Client) service() {
|
|
ticker := time.NewTicker(time.Second * 5)
|
|
for {
|
|
select {
|
|
case serviceUrl := <-c.requestChan:
|
|
c.tappedByUrl[serviceUrl] = true
|
|
case <-ticker.C:
|
|
urls := c.tappedByUrl
|
|
c.tappedByUrl = make(map[string]bool)
|
|
if len(urls) > 0 {
|
|
go func() {
|
|
for u := range c.tappedByUrl {
|
|
c._tapService(u)
|
|
}
|
|
log.Printf("Tapped %v services in batch", len(urls))
|
|
}()
|
|
log.Printf("Tapped %v services in batch", len(urls))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *Client) TapService(serviceUrl *url.URL) {
|
|
c.requestChan <- serviceUrl.String()
|
|
}
|
|
|
|
func (c *Client) _tapService(serviceUrlStr string) error {
|
|
executorUrl := c.executorUrl + "/v2/tapService"
|
|
|
|
resp, err := http.Post(executorUrl, "application/octet-stream", bytes.NewReader([]byte(serviceUrlStr)))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != 200 {
|
|
return fission.MakeErrorFromHTTP(resp)
|
|
}
|
|
return nil
|
|
}
|