[fix] Registration without Internet access

Author: grussorusso

cmd/lb/main.go

@@ -9,12 +9,12 @@ import (
 
 	"golang.org/x/net/context"
 
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
 	"github.com/serverledge-faas/serverledge/internal/config"
 	"github.com/serverledge-faas/serverledge/internal/lb"
 	"github.com/serverledge-faas/serverledge/internal/registration"
 	"github.com/serverledge-faas/serverledge/utils"
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
 )
 
 func registerTerminationHandler(e *echo.Echo) {
@@ -47,14 +47,15 @@ func main() {
 	// TODO: split Area in Region + Type (e.g., cloud/lb/edge)
 	region := config.GetString(config.REGISTRY_AREA, "ROME")
 	registry := &registration.Registry{Area: "lb/" + region}
-	ipAddress, err := utils.GetOutboundIp()
-	if err != nil {
-		log.Printf("Could not get ip address: %v\n", err)
-		return
+
+	defaultAddressStr := "127.0.0.1"
+	address, err := utils.GetOutboundIp()
+	if err == nil {
+		defaultAddressStr = address.String()
 	}
+	registration.RegisteredLocalIP = config.GetString(config.API_IP, defaultAddressStr)
 
-	hostport := fmt.Sprintf("http://%s:%d", ipAddress.String(), config.GetInt(config.API_PORT, 1323))
-	if _, err := registry.RegisterToEtcd(hostport); err != nil {
+	if _, err := registry.RegisterToEtcd(); err != nil {
 		log.Printf("Could not register to Etcd: %v\n", err)
 	}
 

cmd/serverledge/main.go

@@ -46,13 +46,14 @@ func main() {
 		log.Fatal(err)
 	}
 
+	defaultAddressStr := "127.0.0.1"
 	address, err := utils.GetOutboundIp()
-	if err != nil {
-		log.Fatalf("failed to get ip address: %v", err)
+	if err == nil {
+		defaultAddressStr = address.String()
 	}
-	ip := config.GetString(config.API_IP, address.String())
-	url := fmt.Sprintf("http://%s:%d", ip, config.GetInt(config.API_PORT, 1323))
-	myKey, err := registry.RegisterToEtcd(url)
+	registration.RegisteredLocalIP = config.GetString(config.API_IP, defaultAddressStr)
+
+	myKey, err := registry.RegisterToEtcd()
 	if err != nil {
 		log.Fatal(err)
 	}

internal/api/api.go

@@ -214,8 +214,7 @@ func GetServerStatus(c echo.Context) error {
 
 	portNumber := config.GetInt("api.port", 1323)
 
-	address, err := utils.GetOutboundIp()
-	url := fmt.Sprintf("http://%s:%d", address.String(), portNumber)
+	url := fmt.Sprintf("http://%s:%d", registration.RegisteredLocalIP, portNumber)
 
 	loadAvg, err := loadavg.Parse()
 	loadAvgValues := []float64{-1.0, -1.0, -1.0}

internal/api/workflow.go

@@ -6,12 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"time"
 
 	"github.com/cornelk/hashmap"
 	"github.com/labstack/echo/v4"
-	"github.com/labstack/gommon/log"
 	"github.com/serverledge-faas/serverledge/internal/client"
 	"github.com/serverledge-faas/serverledge/internal/function"
 	"github.com/serverledge-faas/serverledge/internal/node"
@@ -50,7 +50,7 @@ func CreateWorkflowFromASL(e echo.Context) error {
 	comp, err := workflow.FromASL(creationRequest.Name, decodedSrc[:])
 	if err != nil {
 		log.Printf("Could not parse workflow from ASL: %v", err)
-		return e.JSON(http.StatusBadRequest, "workflow already exists")
+		return e.JSON(http.StatusBadRequest, "ASL parsing failed")
 	}
 
 	err = comp.Save()

internal/registration/edgeNetUDPDiscovery.go

@@ -16,11 +16,7 @@ import (
 // UDPStatusServer listen for incoming request from other edge-nodes which want to retrieve the status of this server
 // this listener should be called asynchronously in the main function
 func UDPStatusServer() {
-	hostname, err := utils.GetOutboundIp()
-	if err != nil {
-		log.Fatal(err)
-	}
-
+	hostname := RegisteredLocalIP
 	port := config.GetInt(config.LISTEN_UDP_PORT, 9876)
 	address := fmt.Sprintf("%s:%d", hostname, port)
 	udpAddr, err := net.ResolveUDPAddr("udp", address)

internal/registration/registry.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/lithammer/shortuuid"
 	"github.com/serverledge-faas/serverledge/internal/config"
 	"github.com/serverledge-faas/serverledge/utils"
-	"github.com/lithammer/shortuuid"
 	_ "go.etcd.io/etcd/client/v3"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"golang.org/x/net/context"
@@ -17,14 +17,16 @@ import (
 var BASEDIR = "registry"
 var TTL = config.GetInt(config.REGISTRATION_TTL, 20) // lease time in Seconds
 
+var RegisteredLocalIP string = "127.0.0.1"
+
 // getEtcdKey append to a given unique id the logical path depending on the Area.
 // If it is called with  an empty string  it returns the base path for the current local Area.
 func (r *Registry) getEtcdKey(id string) (key string) {
 	return fmt.Sprintf("%s/%s/%s", BASEDIR, r.Area, id)
 }
 
 // RegisterToEtcd make a registration to the local Area; etcd put operation is performed
-func (r *Registry) RegisterToEtcd(hostport string) (string, error) {
+func (r *Registry) RegisterToEtcd() (string, error) {
 	etcdClient, err := utils.GetEtcdClient()
 	if err != nil {
 		log.Fatal(UnavailableClientErr)
@@ -41,6 +43,7 @@ func (r *Registry) RegisterToEtcd(hostport string) (string, error) {
 		return "", err
 	}
 
+	hostport := fmt.Sprintf("http://%s:%d", RegisteredLocalIP, config.GetInt(config.API_PORT, 1323))
 	log.Printf("Registration key: %s\n", r.Key)
 	// save couple (id, hostport) to the correct Area-dir on etcd
 	_, err = etcdClient.Put(ctx, r.Key, hostport, clientv3.WithLease(resp.ID))

internal/test/main_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/serverledge-faas/serverledge/internal/api"
-	"github.com/serverledge-faas/serverledge/internal/config"
 	"github.com/serverledge-faas/serverledge/internal/metrics"
 	"github.com/serverledge-faas/serverledge/internal/node"
 	"github.com/serverledge-faas/serverledge/internal/registration"
@@ -58,9 +57,7 @@ func testStartServerledge(isInCloud bool, outboundIp string) (*registration.Regi
 		log.Fatal(err)
 	}
 
-	ip := config.GetString(config.API_IP, outboundIp)
-	url := fmt.Sprintf("http://%s:%d", ip, PORT)
-	myKey, err := registry.RegisterToEtcd(url)
+	myKey, err := registry.RegisterToEtcd()
 	if err != nil {
 		log.Fatal(err)
 	}

utils/networking.go

@@ -13,10 +13,7 @@ func GetOutboundIp() (net.IP, error) {
 	}
 
 	defer func() {
-		err1 := conn.Close()
-		if err1 != nil {
-			panic(err1)
-		}
+		_ = conn.Close()
 	}()
 
 	localAddr := conn.LocalAddr().(*net.UDPAddr)