Configuration option for stable Node ID

Author: grussorusso

cmd/lb/main.go

@@ -45,7 +45,7 @@ func main() {
 	config.ReadConfiguration(configFileName)
 
 	myArea := config.GetString(config.REGISTRY_AREA, "ROME")
-	node.LocalNode = node.NewIdentifier(myArea)
+	node.LocalNode = node.NewRandomIdentifier(myArea)
 
 	err := registration.RegisterLoadBalancer()
 	if err != nil {

cmd/serverledge/main.go

@@ -32,7 +32,12 @@ func main() {
 
 	// register to etcd, this way server is visible to the others under a given local area
 	myArea := config.GetString(config.REGISTRY_AREA, "ROME")
-	node.LocalNode = node.NewIdentifier(myArea)
+	myId := config.GetString(config.REGISTRY_NODE_ID, "")
+	if myId == "" {
+		node.LocalNode = node.NewRandomIdentifier(myArea)
+	} else {
+		node.LocalNode = node.NewIdentifier(myId, myArea)
+	}
 
 	err := registration.RegisterNode()
 	if err != nil {

internal/config/keys.go

@@ -32,15 +32,12 @@ const CACHE_CLEANUP = "cache.cleanup"
 // default expiration time assigned to a cache item (Seconds)
 const CACHE_ITEM_EXPIRATION = "cache.expiration"
 
-// default policy is to persist cache (boolean). Use false in localonly deployments
-const CACHE_PERSISTENCE = "cache.persistence"
-
-// true if the current server is a remote cloud server
-const IS_IN_CLOUD = "cloud"
-
 // the area wich the server belongs to
 const REGISTRY_AREA = "registry.area"
 
+// (optional) ID of this node (must be unique in the area!)
+const REGISTRY_NODE_ID = "registry.node.id"
+
 // the area that acts as "remote cloud" for this node
 const REGISTRY_REMOTE_AREA = "registry.remote.area"
 

internal/node/node.go

@@ -24,11 +24,15 @@ func (n NodeID) String() string {
 	return fmt.Sprintf("(%s)%s", n.Area, n.Key)
 }
 
-func NewIdentifier(area string) NodeID {
+func NewRandomIdentifier(area string) NodeID {
 	id := shortuuid.New() + strconv.FormatInt(time.Now().UnixNano(), 10)
 	return NodeID{Area: area, Key: id}
 }
 
+func NewIdentifier(id, area string) NodeID {
+	return NodeID{Area: area, Key: id}
+}
+
 type Resources struct {
 	sync.RWMutex
 	totalMemory     int64

internal/test/main_test.go

@@ -47,7 +47,7 @@ func testStartServerledge(isInCloud bool, outboundIp string) *echo.Echo {
 	schedulingPolicy := &scheduling.DefaultLocalPolicy{}
 	// register to etcd, this way server is visible to the others under a given local area
 	myArea := config.GetString(config.REGISTRY_AREA, "ROME")
-	node.LocalNode = node.NewIdentifier(myArea)
+	node.LocalNode = node.NewRandomIdentifier(myArea)
 
 	err := registration.RegisterNode()
 	if err != nil {