Fix requests are sent to unready function pod (newdeploy) (#1005)

* Refactor specialization process
* Separate readiness and liveness probe to different routes

For newdeploy, readiness probe should check whether a fetcher specializes env container successfully or not. In this commit, fetcher returns the actual state of current specialization status instead of returning 200ok directly.

environments/fetcher/client/client.go

@@ -6,10 +6,10 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/fission/fission"
-	"github.com/fission/fission/environments/fetcher"
 )
 
 type (
@@ -20,68 +20,74 @@ type (
 
 func MakeClient(fetcherUrl string) *Client {
 	return &Client{
-		url: fetcherUrl,
+		url: strings.TrimSuffix(fetcherUrl, "/"),
 	}
 }
 
-func (c *Client) Fetch(fr *fetcher.FetchRequest) error {
-	body, err := json.Marshal(fr)
-	if err != nil {
-		return err
-	}
-
-	maxRetries := 20
-	var resp *http.Response
-
-	for i := 0; i < maxRetries; i++ {
-		resp, err = http.Post(c.url, "application/json", bytes.NewReader(body))
-
-		if err == nil {
-			if resp.StatusCode == 200 {
-				resp.Body.Close()
-				return nil
-			}
-			err = fission.MakeErrorFromHTTP(resp)
-		}
-
-		if i < maxRetries-1 {
-			time.Sleep(50 * time.Duration(2*i) * time.Millisecond)
-			log.Printf("Error fetching package (%v), retrying", err)
-			continue
-		}
-
-		log.Printf("Failed to fetch: %v", err)
-		return err
-	}
-
-	return nil
+func (c *Client) getSpecializeUrl() string {
+	return c.url + "/specialize"
 }
 
-func (c *Client) Upload(fr *fetcher.UploadRequest) (*fetcher.UploadResponse, error) {
-	body, err := json.Marshal(fr)
-	if err != nil {
-		return nil, err
-	}
-	resp, err := http.Post(c.url+"/upload", "application/json", bytes.NewReader(body))
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
+func (c *Client) getFetchUrl() string {
+	return c.url + "/fetch"
+}
 
-	if resp.StatusCode != 200 {
-		return nil, fission.MakeErrorFromHTTP(resp)
-	}
+func (c *Client) getUploadUrl() string {
+	return c.url + "/upload"
+}
 
-	rBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
+func (c *Client) Specialize(req *fission.FunctionSpecializeRequest) error {
+	_, err := sendRequest(req, c.getSpecializeUrl())
+	return err
+}
 
-	uploadResp := fetcher.UploadResponse{}
-	err = json.Unmarshal([]byte(rBody), &uploadResp)
+func (c *Client) Fetch(fr *fission.FunctionFetchRequest) error {
+	_, err := sendRequest(fr, c.getFetchUrl())
+	return err
+}
+
+func (c *Client) Upload(fr *fission.ArchiveUploadRequest) (*fission.ArchiveUploadResponse, error) {
+	body, err := sendRequest(fr, c.getUploadUrl())
+
+	uploadResp := fission.ArchiveUploadResponse{}
+	err = json.Unmarshal(body, &uploadResp)
 	if err != nil {
 		return nil, err
 	}
 
 	return &uploadResp, nil
 }
+
+func sendRequest(req interface{}, url string) ([]byte, error) {
+	body, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+
+	maxRetries := 20
+	var resp *http.Response
+
+	for i := 0; i < maxRetries; i++ {
+		resp, err = http.Post(url, "application/json", bytes.NewReader(body))
+
+		if err == nil {
+			if resp.StatusCode == 200 {
+				body, err := ioutil.ReadAll(resp.Body)
+				if err != nil {
+					log.Printf("Error reading response body: %v", err)
+				}
+				resp.Body.Close()
+				return body, err
+			}
+			err = fission.MakeErrorFromHTTP(resp)
+		}
+
+		if i < maxRetries-1 {
+			time.Sleep(50 * time.Duration(2*i) * time.Millisecond)
+			log.Printf("Error specializing/fetching/uploading package (%v) with url %v, retrying", err, url)
+			continue
+		}
+	}
+
+	return nil, err
+}