Extracted agent status to consistent volume (#628)

agent/pkg/providers/tapConfig/tap_config_provider.go

@@ -1,40 +1,32 @@
 package tapConfig
 
 import (
-	"encoding/json"
 	"github.com/up9inc/mizu/shared"
 	"github.com/up9inc/mizu/shared/logger"
-	"io/ioutil"
 	"mizuserver/pkg/models"
+	"mizuserver/pkg/utils"
 	"os"
 	"sync"
 )
 
 const FilePath = shared.DataDirPath + "tap-config.json"
 
-var lock = &sync.Mutex{}
-
-var config *models.TapConfig
+var (
+	lock     = &sync.Mutex{}
+	syncOnce sync.Once
+	config   *models.TapConfig
+)
 
 func Get() *models.TapConfig {
-	if config == nil {
-		lock.Lock()
-		defer lock.Unlock()
+	syncOnce.Do(func() {
+		if err := utils.ReadJsonFile(FilePath, &config); err != nil {
+			config = &models.TapConfig{TappedNamespaces: make(map[string]bool)}
 
-		if config == nil {
-			if content, err := ioutil.ReadFile(FilePath); err != nil {
-				config = &models.TapConfig{TappedNamespaces: make(map[string]bool)}
-				if !os.IsNotExist(err) {
-					logger.Log.Errorf("Error loading tap config from file, err: %v", err)
-				}
-			} else {
-				if err = json.Unmarshal(content, &config); err != nil {
-					config = &models.TapConfig{TappedNamespaces: make(map[string]bool)}
-					logger.Log.Errorf("Error while unmarshal tap config, err: %v", err)
-				}
+			if !os.IsNotExist(err) {
+				logger.Log.Errorf("Error reading tap config from file, err: %v", err)
 			}
 		}
-	}
+	})
 
 	return config
 }
@@ -44,11 +36,7 @@ func Save(tapConfigToSave *models.TapConfig) {
 	defer lock.Unlock()
 
 	config = tapConfigToSave
-	if data, err := json.Marshal(config); err != nil {
-		logger.Log.Errorf("Error while marshal tap config, err: %v", err)
-	} else {
-		if err := ioutil.WriteFile(FilePath, data, 0644); err != nil {
-			logger.Log.Errorf("Error writing tap config to file, err: %v", err)
-		}
+	if err := utils.SaveJsonFile(FilePath, config); err != nil {
+		logger.Log.Errorf("Error saving tap config, err: %v", err)
 	}
 }

agent/pkg/providers/tappedPods/tapped_pods_provider.go

@@ -2,25 +2,49 @@ package tappedPods
 
 import (
 	"github.com/up9inc/mizu/shared"
-	"mizuserver/pkg/providers/tappersStatus"
+	"github.com/up9inc/mizu/shared/logger"
+	"mizuserver/pkg/providers/tappers"
+	"mizuserver/pkg/utils"
+	"os"
 	"strings"
+	"sync"
 )
 
-var tappedPods []*shared.PodInfo
+const FilePath = shared.DataDirPath + "tapped-pods.json"
+
+var (
+	lock       = &sync.Mutex{}
+	syncOnce   sync.Once
+	tappedPods []*shared.PodInfo
+)
 
 func Get() []*shared.PodInfo {
+	syncOnce.Do(func() {
+		if err := utils.ReadJsonFile(FilePath, &tappedPods); err != nil {
+			if !os.IsNotExist(err) {
+				logger.Log.Errorf("Error reading tapped pods from file, err: %v", err)
+			}
+		}
+	})
+
 	return tappedPods
 }
 
 func Set(tappedPodsToSet []*shared.PodInfo) {
+	lock.Lock()
+	defer lock.Unlock()
+
 	tappedPods = tappedPodsToSet
+	if err := utils.SaveJsonFile(FilePath, tappedPods); err != nil {
+		logger.Log.Errorf("Error saving tapped pods, err: %v", err)
+	}
 }
 
 func GetTappedPodsStatus() []shared.TappedPodStatus {
 	tappedPodsStatus := make([]shared.TappedPodStatus, 0)
 	for _, pod := range Get() {
 		var status string
-		if tapperStatus, ok := tappersStatus.Get()[pod.NodeName]; ok {
+		if tapperStatus, ok := tappers.GetStatus()[pod.NodeName]; ok {
 			status = strings.ToLower(tapperStatus.Status)
 		}
 

agent/pkg/providers/tappers/tappers_provider.go

@@ -0,0 +1,82 @@
+package tappers
+
+import (
+	"github.com/up9inc/mizu/shared"
+	"github.com/up9inc/mizu/shared/logger"
+	"mizuserver/pkg/utils"
+	"os"
+	"sync"
+)
+
+const FilePath = shared.DataDirPath + "tappers-status.json"
+
+var (
+	lockStatus = &sync.Mutex{}
+	syncOnce   sync.Once
+	status     map[string]*shared.TapperStatus
+
+	lockConnectedCount = &sync.Mutex{}
+	connectedCount     int
+)
+
+func GetStatus() map[string]*shared.TapperStatus {
+	initStatus()
+
+	return status
+}
+
+func SetStatus(tapperStatus *shared.TapperStatus) {
+	initStatus()
+
+	lockStatus.Lock()
+	defer lockStatus.Unlock()
+
+	status[tapperStatus.NodeName] = tapperStatus
+
+	saveStatus()
+}
+
+func ResetStatus() {
+	lockStatus.Lock()
+	defer lockStatus.Unlock()
+
+	status = make(map[string]*shared.TapperStatus)
+
+	saveStatus()
+}
+
+func GetConnectedCount() int {
+	return connectedCount
+}
+
+func Connected() {
+	lockConnectedCount.Lock()
+	defer lockConnectedCount.Unlock()
+
+	connectedCount++
+}
+
+func Disconnected() {
+	lockConnectedCount.Lock()
+	defer lockConnectedCount.Unlock()
+
+	connectedCount--
+}
+
+func initStatus() {
+	syncOnce.Do(func() {
+		if err := utils.ReadJsonFile(FilePath, &status); err != nil {
+			status = make(map[string]*shared.TapperStatus)
+
+			if !os.IsNotExist(err) {
+				logger.Log.Errorf("Error reading tappers status from file, err: %v", err)
+			}
+		}
+	})
+}
+
+func saveStatus() {
+	if err := utils.SaveJsonFile(FilePath, status); err != nil {
+		logger.Log.Errorf("Error saving tappers status, err: %v", err)
+	}
+}

agent/pkg/providers/tappersCount/tappers_count_provider.go

@@ -1,25 +0,0 @@
-package tappersCount
-
-import "sync"
-
-var lock = &sync.Mutex{}
-
-var tappersCount int
-
-func Add() {
-	lock.Lock()
-	defer lock.Unlock()
-
-	tappersCount++
-}
-
-func Remove() {
-	lock.Lock()
-	defer lock.Unlock()
-
-	tappersCount--
-}
-
-func Get() int {
-	return tappersCount
-}

agent/pkg/providers/tappersStatus/tappers_status_provider.go

@@ -1,25 +0,0 @@
-package tappersStatus
-
-import "github.com/up9inc/mizu/shared"
-
-var tappersStatus map[string]*shared.TapperStatus
-
-func Get() map[string]*shared.TapperStatus {
-	if tappersStatus == nil {
-		tappersStatus = make(map[string]*shared.TapperStatus)
-	}
-
-	return tappersStatus
-}
-
-func Set(tapperStatus *shared.TapperStatus) {
-	if tappersStatus == nil {
-		tappersStatus = make(map[string]*shared.TapperStatus)
-	}
-
-	tappersStatus[tapperStatus.NodeName] = tapperStatus
-}
-
-func Reset() {
-	tappersStatus = make(map[string]*shared.TapperStatus)
-}