lib/config, lib/model: Use path from locations to check disk space for db (syncthing#5525)

imsodin · AudriusButkevicius · commit 4299af1c639e · 2019-02-12T12:25:11.000Z
diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go
@@ -278,7 +278,7 @@ func (f *FolderConfiguration) CheckAvailableSpace(req int64) error {
 	}
 	usage.Free -= req
 	if usage.Free > 0 {
-		if err := checkFreeSpace(f.MinDiskFree, usage); err == nil {
+		if err := CheckFreeSpace(f.MinDiskFree, usage); err == nil {
 			return nil
 		}
 	}
diff --git a/lib/config/size.go b/lib/config/size.go
@@ -78,7 +78,7 @@ func (s *Size) ParseDefault(str string) error {
 	return err
 }
 
-func checkFreeSpace(req Size, usage fs.Usage) error {
+func CheckFreeSpace(req Size, usage fs.Usage) error {
 	val := req.BaseValue()
 	if val <= 0 {
 		return nil
diff --git a/lib/config/wrapper.go b/lib/config/wrapper.go
@@ -7,14 +7,11 @@
 package config
 
 import (
-	"fmt"
 	"os"
-	"path/filepath"
 	"sync/atomic"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/events"
-	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/sync"
@@ -488,15 +485,3 @@ func (w *Wrapper) AddOrUpdatePendingFolder(id, label string, device protocol.Dev
 
 	panic("bug: adding pending folder for non-existing device")
 }
-
-// CheckHomeFreeSpace returns nil if the home disk has the required amount of
-// free space, or if home disk free space checking is disabled.
-func (w *Wrapper) CheckHomeFreeSpace() error {
-	path := filepath.Dir(w.ConfigPath())
-	if usage, err := fs.NewFilesystem(fs.FilesystemTypeBasic, path).Usage("."); err == nil {
-		if err = checkFreeSpace(w.Options().MinHomeDiskFree, usage); err != nil {
-			return fmt.Errorf("insufficient space on home disk (%v): %v", path, err)
-		}
-	}
-	return nil
-}
diff --git a/lib/model/folder.go b/lib/model/folder.go
@@ -21,6 +21,7 @@ import (
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/ignore"
+	"github.com/syncthing/syncthing/lib/locations"
 	"github.com/syncthing/syncthing/lib/osutil"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/scanner"
@@ -269,8 +270,11 @@ func (f *folder) getHealthError() error {
 		return err
 	}
 
-	if err := f.model.cfg.CheckHomeFreeSpace(); err != nil {
-		return err
+	dbPath := locations.Get(locations.Database)
+	if usage, err := fs.NewFilesystem(fs.FilesystemTypeBasic, dbPath).Usage("."); err == nil {
+		if err = config.CheckFreeSpace(f.model.cfg.Options().MinHomeDiskFree, usage); err != nil {
+			return fmt.Errorf("insufficient space on disk for database (%v): %v", dbPath, err)
+		}
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func (f *FolderConfiguration) CheckAvailableSpace(req int64) error {`
`278`	`278`	`}`
`279`	`279`	`usage.Free -= req`
`280`	`280`	`if usage.Free > 0 {`
`281`		`- if err := checkFreeSpace(f.MinDiskFree, usage); err == nil {`
	`281`	`+ if err := CheckFreeSpace(f.MinDiskFree, usage); err == nil {`
`282`	`282`	`return nil`
`283`	`283`	`}`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (s *Size) ParseDefault(str string) error {`
`78`	`78`	`return err`
`79`	`79`	`}`
`80`	`80`
`81`		`-func checkFreeSpace(req Size, usage fs.Usage) error {`
	`81`	`+func CheckFreeSpace(req Size, usage fs.Usage) error {`
`82`	`82`	`val := req.BaseValue()`
`83`	`83`	`if val <= 0 {`
`84`	`84`	`return nil`