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

Don't crash on zero nodes in pull

Browse Source
This commit is contained in:
Jakob Borg 2013-12-30 19:49:25 -05:00
parent 71d50a50f4
commit 4097528aa2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model_puller.go
View File

@ -30,8 +30,13 @@ func (m *Model) pullFile(name string) error {
m.RLock() m.RLock()
var localFile = m.local[name] var localFile = m.local[name]
var globalFile = m.global[name] var globalFile = m.global[name]
var nodeIDs = m.whoHas(name)
m.RUnlock() m.RUnlock()
if len(nodeIDs) == 0 {
return errNoSuchNode
}
filename := path.Join(m.dir, name) filename := path.Join(m.dir, name)
sdir := path.Dir(filename) sdir := path.Dir(filename)
@ -77,9 +82,6 @@ func (m *Model) pullFile(name string) error {
// N remote copy routines // N remote copy routines
m.RLock()
var nodeIDs = m.whoHas(name)
m.RUnlock()
var remoteBlocks = blockIterator{blocks: remote} var remoteBlocks = blockIterator{blocks: remote}
for i := 0; i < opts.Advanced.RequestsInFlight; i++ { for i := 0; i < opts.Advanced.RequestsInFlight; i++ {
curNode := nodeIDs[i%len(nodeIDs)] curNode := nodeIDs[i%len(nodeIDs)]