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

lib/config: Sanity checks on MaxConcurrentWrites (ref #7064) (#7069)

Browse Source
This commit is contained in:
Simon Frei 2020-11-03 19:09:32 +01:00 committed by GitHub
parent c206fbdc58
commit d0ccea0404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/config/config_test.go
View File

@ -129,6 +129,7 @@ func TestDeviceConfig(t *testing.T) {
WeakHashThresholdPct: 25,
MarkerName: DefaultMarkerName,
JunctionsAsDirs: true,
MaxConcurrentWrites: maxConcurrentWritesDefault,
},
}

12
lib/config/folderconfiguration.go
View File

@ -26,7 +26,11 @@ var (
ErrMarkerMissing = errors.New("folder marker missing (this indicates potential data loss, search docs/forum to get information about how to proceed)")
)
const DefaultMarkerName = ".stfolder"
const (
DefaultMarkerName = ".stfolder"
maxConcurrentWritesDefault = 2
maxConcurrentWritesLimit = 64
)
func NewFolderConfiguration(myID protocol.DeviceID, id, label string, fsType fs.FilesystemType, path string) FolderConfiguration {
f := FolderConfiguration{
@ -206,6 +210,12 @@ func (f *FolderConfiguration) prepare() {
if f.MarkerName == "" {
f.MarkerName = DefaultMarkerName
}
if f.MaxConcurrentWrites <= 0 {
f.MaxConcurrentWrites = maxConcurrentWritesDefault
} else if f.MaxConcurrentWrites > maxConcurrentWritesLimit {
f.MaxConcurrentWrites = maxConcurrentWritesLimit
}
}
// RequiresRestartOnly returns a copy with only the attributes that require