summaryrefslogtreecommitdiffstats
path: root/model/cluster_info.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-04-04 11:42:07 -0700
committerHarrison Healey <harrisonmhealey@gmail.com>2017-04-04 14:42:07 -0400
commit6bf080393d88534aa658ecaff32ae089bd304772 (patch)
treebe25ba4cea3d687d11fe49537b84fae4bf21a484 /model/cluster_info.go
parent32460bf63bc07c69ee5da0bb5640b879facb5538 (diff)
downloadchat-6bf080393d88534aa658ecaff32ae089bd304772.tar.gz
chat-6bf080393d88534aa658ecaff32ae089bd304772.tar.bz2
chat-6bf080393d88534aa658ecaff32ae089bd304772.zip
Fixing race conditions in the code base (#5966)
* Adding initial race detector * Remove setting of config twice * Fixing config file watch and config reload on license save * Fixing config file watch and config reload on license save * Fixing build error * Fixing locking issue * Fixing makefile * Fixing race in config * Fixing race in status unit test * Adding EE race tests * Fixing race in cluster info * Removing code that's isn't needed * Fixing some more races * Fixing govet issue
Diffstat (limited to 'model/cluster_info.go')
-rw-r--r--model/cluster_info.go50
1 files changed, 43 insertions, 7 deletions
diff --git a/model/cluster_info.go b/model/cluster_info.go
index 7c3384ae2..0e4b1e365 100644
--- a/model/cluster_info.go
+++ b/model/cluster_info.go
@@ -6,19 +6,25 @@ package model
import (
"encoding/json"
"io"
+ "strings"
+ "sync"
+ "sync/atomic"
)
type ClusterInfo struct {
- Id string `json:"id"`
- Version string `json:"version"`
- ConfigHash string `json:"config_hash"`
- InterNodeUrl string `json:"internode_url"`
- Hostname string `json:"hostname"`
- LastSuccessfulPing int64 `json:"last_ping"`
- IsAlive bool `json:"is_alive"`
+ Id string `json:"id"`
+ Version string `json:"version"`
+ ConfigHash string `json:"config_hash"`
+ InterNodeUrl string `json:"internode_url"`
+ Hostname string `json:"hostname"`
+ LastSuccessfulPing int64 `json:"last_ping"`
+ Alive int32 `json:"is_alive"`
+ Mutex sync.RWMutex `json:"-"`
}
func (me *ClusterInfo) ToJson() string {
+ me.Mutex.RLock()
+ defer me.Mutex.RUnlock()
b, err := json.Marshal(me)
if err != nil {
return ""
@@ -27,9 +33,15 @@ func (me *ClusterInfo) ToJson() string {
}
}
+func (me *ClusterInfo) Copy() *ClusterInfo {
+ json := me.ToJson()
+ return ClusterInfoFromJson(strings.NewReader(json))
+}
+
func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
decoder := json.NewDecoder(data)
var me ClusterInfo
+ me.Mutex = sync.RWMutex{}
err := decoder.Decode(&me)
if err == nil {
return &me
@@ -38,7 +50,21 @@ func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
}
}
+func (me *ClusterInfo) SetAlive(alive bool) {
+ if alive {
+ atomic.StoreInt32(&me.Alive, 1)
+ } else {
+ atomic.StoreInt32(&me.Alive, 0)
+ }
+}
+
+func (me *ClusterInfo) IsAlive() bool {
+ return atomic.LoadInt32(&me.Alive) == 1
+}
+
func (me *ClusterInfo) HaveEstablishedInitialContact() bool {
+ me.Mutex.RLock()
+ defer me.Mutex.RUnlock()
if me.Id != "" {
return true
}
@@ -46,6 +72,16 @@ func (me *ClusterInfo) HaveEstablishedInitialContact() bool {
return false
}
+func (me *ClusterInfo) IdEqualTo(in string) bool {
+ me.Mutex.RLock()
+ defer me.Mutex.RUnlock()
+ if me.Id == in {
+ return true
+ }
+
+ return false
+}
+
func ClusterInfosToJson(objmap []*ClusterInfo) string {
if b, err := json.Marshal(objmap); err != nil {
return ""