octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 23:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct handling of WasSeen for new nodes

Browse Source
This commit is contained in:
Jakob Borg 2014-09-20 19:14:45 +02:00
parent e13976a3b3
commit 80a2a934dd
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
model/model.go
View File

@ -119,10 +119,6 @@ func NewModel(indexDir string, cfg *config.Configuration, nodeName, clientName,
nodeVer: make(map[protocol.NodeID]string), nodeVer: make(map[protocol.NodeID]string),
} }
for _, node := range cfg.Nodes {
m.nodeStatRefs[node.NodeID] = stats.NewNodeStatisticsReference(db, node.NodeID)
}
var timeout = 20 * 60 // seconds var timeout = 20 * 60 // seconds
if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 { if t := os.Getenv("STDEADLOCKTIMEOUT"); len(t) > 0 {
it, err := strconv.Atoi(t) it, err := strconv.Atoi(t)
@ -203,11 +199,9 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
// Returns statistics about each node // Returns statistics about each node
func (m *Model) NodeStatistics() map[string]stats.NodeStatistics { func (m *Model) NodeStatistics() map[string]stats.NodeStatistics {
var res = make(map[string]stats.NodeStatistics) var res = make(map[string]stats.NodeStatistics)
m.rmut.RLock()
for _, node := range m.cfg.Nodes { for _, node := range m.cfg.Nodes {
res[node.NodeID.String()] = m.nodeStatRefs[node.NodeID].GetStatistics() res[node.NodeID.String()] = m.nodeStatRef(node.NodeID).GetStatistics()
} }
m.rmut.RUnlock()
return res return res
} }
@ -578,12 +572,10 @@ func (cf cFiler) CurrentFile(file string) protocol.FileInfo {
func (m *Model) ConnectedTo(nodeID protocol.NodeID) bool { func (m *Model) ConnectedTo(nodeID protocol.NodeID) bool {
m.pmut.RLock() m.pmut.RLock()
_, ok := m.protoConn[nodeID] _, ok := m.protoConn[nodeID]
if ok {
if statRef, ok := m.nodeStatRefs[nodeID]; ok {
statRef.WasSeen()
}
}
m.pmut.RUnlock() m.pmut.RUnlock()
if ok {
m.nodeWasSeen(nodeID)
}
return ok return ok
} }
@ -611,13 +603,27 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn protocol.Connection)
fs := m.repoFiles[repo] fs := m.repoFiles[repo]
go sendIndexes(protoConn, repo, fs, m.repoIgnores[repo]) go sendIndexes(protoConn, repo, fs, m.repoIgnores[repo])
} }
if statRef, ok := m.nodeStatRefs[nodeID]; ok {
statRef.WasSeen()
} else {
l.Warnf("AddConnection for unconfigured node %v?", nodeID)
}
m.rmut.RUnlock() m.rmut.RUnlock()
m.pmut.Unlock() m.pmut.Unlock()
m.nodeWasSeen(nodeID)
}
func (m *Model) nodeStatRef(nodeID protocol.NodeID) *stats.NodeStatisticsReference {
m.rmut.Lock()
defer m.rmut.Unlock()
if sr, ok := m.nodeStatRefs[nodeID]; ok {
return sr
} else {
sr = stats.NewNodeStatisticsReference(m.db, nodeID)
m.nodeStatRefs[nodeID] = sr
return sr
}
}
func (m *Model) nodeWasSeen(nodeID protocol.NodeID) {
m.nodeStatRef(nodeID).WasSeen()
} }
func sendIndexes(conn protocol.Connection, repo string, fs *files.Set, ignores ignore.Patterns) { func sendIndexes(conn protocol.Connection, repo string, fs *files.Set, ignores ignore.Patterns) {