octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-24 15:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit size of sent indexes a bit, taking number of blocks into account

Browse Source
This commit is contained in:
Jakob Borg 2014-08-11 20:54:59 +02:00
parent 9752ea9ac3
commit 60da59623e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
model/model.go
View File

@ -56,7 +56,12 @@ func (s repoState) String() string {
const zeroEntrySize = 128 const zeroEntrySize = 128
// How many files to send in each Index/IndexUpdate message. // How many files to send in each Index/IndexUpdate message.
const indexBatchSize = 1000 const (
indexTargetSize = 250 * 1024 // Aim for making index messages no larger than 250 KiB (uncompressed)
indexPerFileSize = 250 // Each FileInfo is approximately this big, in bytes, excluding BlockInfos
IndexPerBlockSize = 40 // Each BlockInfo is approximately this big
indexBatchSize = 1000 // Either way, don't include more files than this
)
type Model struct { type Model struct {
indexDir string indexDir string
@ -593,6 +598,7 @@ func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, rep
nodeID := conn.ID() nodeID := conn.ID()
name := conn.Name() name := conn.Name()
batch := make([]protocol.FileInfo, 0, indexBatchSize) batch := make([]protocol.FileInfo, 0, indexBatchSize)
currentBatchSize := 0
maxLocalVer := uint64(0) maxLocalVer := uint64(0)
var err error var err error
@ -605,13 +611,13 @@ func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, rep
maxLocalVer = f.LocalVersion maxLocalVer = f.LocalVersion
} }
if len(batch) == indexBatchSize { if len(batch) == indexBatchSize || currentBatchSize > indexTargetSize {
if initial { if initial {
if err = conn.Index(repo, batch); err != nil { if err = conn.Index(repo, batch); err != nil {
return false return false
} }
if debug { if debug {
l.Debugf("sendIndexes for %s-%s/%q: %d files (initial index)", nodeID, name, repo, len(batch)) l.Debugf("sendIndexes for %s-%s/%q: %d files (<%d bytes) (initial index)", nodeID, name, repo, len(batch), currentBatchSize)
} }
initial = false initial = false
} else { } else {
@ -619,14 +625,16 @@ func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, rep
return false return false
} }
if debug { if debug {
l.Debugf("sendIndexes for %s-%s/%q: %d files (batched update)", nodeID, name, repo, len(batch)) l.Debugf("sendIndexes for %s-%s/%q: %d files (<%d bytes) (batched update)", nodeID, name, repo, len(batch), currentBatchSize)
} }
} }
batch = make([]protocol.FileInfo, 0, indexBatchSize) batch = make([]protocol.FileInfo, 0, indexBatchSize)
currentBatchSize = 0
} }
batch = append(batch, f) batch = append(batch, f)
currentBatchSize += indexPerFileSize + len(f.Blocks)*IndexPerBlockSize
return true return true
}) })