fixed sync man lock problem

Author: YourTechBud

config/load.go

@@ -19,13 +19,15 @@ func loadEnvironmentVariable(c *Config) {
 				p.Secret = tempEnvVar
 			}
 		}
-		for _, value := range p.Modules.Crud {
-			if strings.HasPrefix(value.Conn, "$") {
-				tempStringC := strings.TrimPrefix(value.Conn, "$")
-				tempEnvVarC, presentC := os.LookupEnv(tempStringC)
-
-				if presentC {
-					value.Conn = tempEnvVarC
+		if p.Modules != nil {
+			for _, value := range p.Modules.Crud {
+				if strings.HasPrefix(value.Conn, "$") {
+					tempStringC := strings.TrimPrefix(value.Conn, "$")
+					tempEnvVarC, presentC := os.LookupEnv(tempStringC)
+
+					if presentC {
+						value.Conn = tempEnvVarC
+					}
 				}
 			}
 		}

go.sum

@@ -167,6 +167,7 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUt
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -225,7 +226,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed h1:uPxWBzB3+mlnjy9W58qY1j/cjyFjutgw/Vhan2zLy/A=
 golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

utils/syncman/operations.go

@@ -15,15 +15,15 @@ import (
 
 // SetGlobalConfig sets the global config. This must be called before the Start command.
 func (s *SyncManager) SetGlobalConfig(c *config.Config) {
-	s.lock.Lock()
+	s.internalLock.Lock()
 	s.projectConfig = c
-	s.lock.Unlock()
+	s.internalLock.Unlock()
 }
 
 // GetGlobalConfig gets the global config
 func (s *SyncManager) GetGlobalConfig() *config.Config {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 	return s.projectConfig
 }
 
@@ -59,8 +59,8 @@ func makeRequest(method, token, url string, data *bytes.Buffer) error {
 // SetOperationModeConfig applies the operation config to the raft log
 func (s *SyncManager) SetOperationModeConfig(token string, op *config.OperationConfig) error {
 	// Acquire a lock to make sure only a single operation occurs at any given point of time
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	if s.raft.State() != raft.Leader {
 		// Marshal json into byte array
@@ -84,8 +84,8 @@ func (s *SyncManager) SetOperationModeConfig(token string, op *config.OperationC
 // SetProjectConfig applies the config to the raft log
 func (s *SyncManager) SetProjectConfig(token string, project *config.Project) error {
 	// Acquire a lock to make sure only a single operation occurs at any given point of time
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	if s.raft.State() != raft.Leader {
 		// Marshal json into byte array
@@ -105,7 +105,10 @@ func (s *SyncManager) SetProjectConfig(token string, project *config.Project) er
 
 	// Create a raft command
 	c := &model.RaftCommand{Kind: utils.RaftCommandSet, Project: project, ID: project.ID}
-	data, _ := json.Marshal(c)
+	data, err := json.Marshal(c)
+	if err != nil {
+		return err
+	}
 
 	// Apply the command to the raft log
 	return s.raft.Apply(data, 0).Error()
@@ -114,8 +117,8 @@ func (s *SyncManager) SetProjectConfig(token string, project *config.Project) er
 // SetDeployConfig applies the config to the raft log
 func (s *SyncManager) SetDeployConfig(token string, deploy *config.Deploy) error {
 	// Acquire a lock to make sure only a single operation occurs at any given point of time
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	if s.raft.State() != raft.Leader {
 		// Marshal json into byte array
@@ -139,8 +142,8 @@ func (s *SyncManager) SetDeployConfig(token string, deploy *config.Deploy) error
 // DeleteConfig applies the config to the raft log
 func (s *SyncManager) DeleteConfig(token, projectID string) error {
 	// Acquire a lock to make sure only a single operation occurs at any given point of time
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	if s.raft.State() != raft.Leader {
 
@@ -161,8 +164,8 @@ func (s *SyncManager) DeleteConfig(token, projectID string) error {
 
 // GetConfig returns the config present in the state
 func (s *SyncManager) GetConfig(projectID string) (*config.Project, error) {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	// Iterate over all projects stored
 	for _, p := range s.projectConfig.Projects {

utils/syncman/raft.go

@@ -47,6 +47,13 @@ func (s *SyncManager) initRaft(seeds []*node) error {
 	config := raft.DefaultConfig()
 	config.LocalID = raft.ServerID(s.projectConfig.NodeID)
 	config.LogOutput = ioutil.Discard
+	config.SnapshotInterval = time.Hour * 3
+	config.SnapshotThreshold = 3
+
+	// Check if config is valid
+	if err := raft.ValidateConfig(config); err != nil {
+		return err
+	}
 
 	// Instantiate the Raft systems.
 	r, err := raft.NewRaft(config, s, logStore, stableStore, snapshots, transport)
@@ -73,15 +80,14 @@ func (s *SyncManager) initRaft(seeds []*node) error {
 
 // Apply applies a Raft log entry to the key-value store
 func (s *SyncManager) Apply(l *raft.Log) interface{} {
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	// s.internalLock.Lock()
+	// defer s.internalLock.Unlock()
 
 	var c model.RaftCommand
 	json.Unmarshal(l.Data, &c)
 
 	switch c.Kind {
 	case utils.RaftCommandSet:
-
 		found := false
 		for i, p := range s.projectConfig.Projects {
 			if p.ID == c.Project.ID {
@@ -126,6 +132,7 @@ func (s *SyncManager) Apply(l *raft.Log) interface{} {
 		// Write the config to file
 		config.StoreConfigToFile(s.projectConfig, s.configFile)
 	}
+
 	return nil
 }
 
@@ -144,8 +151,8 @@ func (s *SyncManager) Restore(rc io.ReadCloser) error {
 
 // Snapshot returns a snapshot of the key-value store.
 func (s *SyncManager) Snapshot() (raft.FSMSnapshot, error) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
+	s.internalLock.Lock()
+	defer s.internalLock.Unlock()
 
 	return &fsmSnapshot{store: s.projectConfig}, nil
 }

utils/syncman/syncman.go

@@ -15,7 +15,7 @@ import (
 
 // SyncManager syncs the project config between folders
 type SyncManager struct {
-	lock          sync.RWMutex
+	internalLock  sync.Mutex
 	raft          *raft.Raft
 	projectConfig *config.Config
 	configFile    string
@@ -45,7 +45,7 @@ func New(projects *projects.Projects, d *deploy.Module, adminMan *admin.Manager)
 // Start begins the sync manager operations
 func (s *SyncManager) Start(nodeID, configFilePath, gossipPort, raftPort string, seeds []string) error {
 	// Save the ports
-	s.lock.Lock()
+	s.internalLock.Lock()
 	s.gossipPort = gossipPort
 	s.raftPort = raftPort
 
@@ -64,7 +64,7 @@ func (s *SyncManager) Start(nodeID, configFilePath, gossipPort, raftPort string,
 		}
 	}
 
-	s.lock.Unlock()
+	s.internalLock.Unlock()
 
 	// Start the membership protocol
 	if err := s.initMembership(seeds); err != nil {