aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/api/api.go13
-rw-r--r--lib/db/set.go21
-rw-r--r--lib/model/folder_summary.go56
-rw-r--r--lib/syncthing/verboseservice.go10
4 files changed, 39 insertions, 61 deletions
diff --git a/lib/api/api.go b/lib/api/api.go
index b96fc14ee..5a4ee76a7 100644
--- a/lib/api/api.go
+++ b/lib/api/api.go
@@ -355,12 +355,7 @@ func (s *service) Serve(ctx context.Context) error {
// Handle Prometheus metrics
promHttpHandler := promhttp.Handler()
- mux.HandleFunc("/metrics", func(w http.ResponseWriter, req *http.Request) {
- // fetching metrics counts as an event, for the purpose of whether
- // we should prepare folder summaries etc.
- s.fss.OnEventRequest()
- promHttpHandler.ServeHTTP(w, req)
- })
+ mux.Handle("/metrics", promHttpHandler)
guiCfg := s.cfg.GUI()
@@ -1395,11 +1390,7 @@ func (s *service) getDiskEvents(w http.ResponseWriter, r *http.Request) {
s.getEvents(w, r, sub)
}
-func (s *service) getEvents(w http.ResponseWriter, r *http.Request, eventSub events.BufferedSubscription) {
- if eventSub.Mask()&(events.FolderSummary|events.FolderCompletion) != 0 {
- s.fss.OnEventRequest()
- }
-
+func (*service) getEvents(w http.ResponseWriter, r *http.Request, eventSub events.BufferedSubscription) {
qs := r.URL.Query()
sinceStr := qs.Get("since")
limitStr := qs.Get("limit")
diff --git a/lib/db/set.go b/lib/db/set.go
index 178800fd1..84cfb3452 100644
--- a/lib/db/set.go
+++ b/lib/db/set.go
@@ -338,17 +338,22 @@ func (s *Snapshot) Sequence(device protocol.DeviceID) int64 {
return s.meta.Counts(device, 0).Sequence
}
-// RemoteSequence returns the change version for the given folder, as
-// sent by remote peers. This is guaranteed to increment if the contents of
-// the remote or global folder has changed.
-func (s *Snapshot) RemoteSequence() int64 {
- var ver int64
-
+// RemoteSequences returns a map of the sequence numbers seen for each
+// remote device sharing this folder.
+func (s *Snapshot) RemoteSequences() map[protocol.DeviceID]int64 {
+ res := make(map[protocol.DeviceID]int64)
for _, device := range s.meta.devices() {
- ver += s.Sequence(device)
+ switch device {
+ case protocol.EmptyDeviceID, protocol.LocalDeviceID, protocol.GlobalDeviceID:
+ continue
+ default:
+ if seq := s.Sequence(device); seq > 0 {
+ res[device] = seq
+ }
+ }
}
- return ver
+ return res
}
func (s *Snapshot) LocalSize() Counts {
diff --git a/lib/model/folder_summary.go b/lib/model/folder_summary.go
index 708c96ae3..95653c1de 100644
--- a/lib/model/folder_summary.go
+++ b/lib/model/folder_summary.go
@@ -25,12 +25,9 @@ import (
"github.com/syncthing/syncthing/lib/sync"
)
-const maxDurationSinceLastEventReq = time.Minute
-
type FolderSummaryService interface {
suture.Service
Summary(folder string) (*FolderSummary, error)
- OnEventRequest()
}
// The folderSummaryService adds summary information events (FolderSummary and
@@ -47,23 +44,18 @@ type folderSummaryService struct {
// For keeping track of folders to recalculate for
foldersMut sync.Mutex
folders map[string]struct{}
-
- // For keeping track of when the last event request on the API was
- lastEventReq time.Time
- lastEventReqMut sync.Mutex
}
func NewFolderSummaryService(cfg config.Wrapper, m Model, id protocol.DeviceID, evLogger events.Logger) FolderSummaryService {
service := &folderSummaryService{
- Supervisor: suture.New("folderSummaryService", svcutil.SpecWithDebugLogger(l)),
- cfg: cfg,
- model: m,
- id: id,
- evLogger: evLogger,
- immediate: make(chan string),
- folders: make(map[string]struct{}),
- foldersMut: sync.NewMutex(),
- lastEventReqMut: sync.NewMutex(),
+ Supervisor: suture.New("folderSummaryService", svcutil.SpecWithDebugLogger(l)),
+ cfg: cfg,
+ model: m,
+ id: id,
+ evLogger: evLogger,
+ immediate: make(chan string),
+ folders: make(map[string]struct{}),
+ foldersMut: sync.NewMutex(),
}
service.Add(svcutil.AsService(service.listenForUpdates, fmt.Sprintf("%s/listenForUpdates", service)))
@@ -119,8 +111,9 @@ type FolderSummary struct {
StateChanged time.Time `json:"stateChanged"`
Error string `json:"error"`
- Version int64 `json:"version"` // deprecated
- Sequence int64 `json:"sequence"`
+ Version int64 `json:"version"` // deprecated
+ Sequence int64 `json:"sequence"`
+ RemoteSequence map[protocol.DeviceID]int64 `json:"remoteSequence"`
IgnorePatterns bool `json:"ignorePatterns"`
WatchError string `json:"watchError"`
@@ -130,7 +123,8 @@ func (c *folderSummaryService) Summary(folder string) (*FolderSummary, error) {
res := new(FolderSummary)
var local, global, need, ro db.Counts
- var ourSeq, remoteSeq int64
+ var ourSeq int64
+ var remoteSeq map[protocol.DeviceID]int64
errors, err := c.model.FolderErrors(folder)
if err == nil {
var snap *db.Snapshot
@@ -140,7 +134,7 @@ func (c *folderSummaryService) Summary(folder string) (*FolderSummary, error) {
need = snap.NeedSize(protocol.LocalDeviceID)
ro = snap.ReceiveOnlyChangedSize()
ourSeq = snap.Sequence(protocol.LocalDeviceID)
- remoteSeq = snap.Sequence(protocol.GlobalDeviceID)
+ remoteSeq = snap.RemoteSequences()
snap.Release()
}
}
@@ -192,8 +186,9 @@ func (c *folderSummaryService) Summary(folder string) (*FolderSummary, error) {
res.Error = err.Error()
}
- res.Version = ourSeq + remoteSeq // legacy
- res.Sequence = ourSeq + remoteSeq // new name
+ res.Version = ourSeq // legacy
+ res.Sequence = ourSeq
+ res.RemoteSequence = remoteSeq
ignorePatterns, _, _ := c.model.CurrentIgnores(folder)
res.IgnorePatterns = false
@@ -212,12 +207,6 @@ func (c *folderSummaryService) Summary(folder string) (*FolderSummary, error) {
return res, nil
}
-func (c *folderSummaryService) OnEventRequest() {
- c.lastEventReqMut.Lock()
- c.lastEventReq = time.Now()
- c.lastEventReqMut.Unlock()
-}
-
// listenForUpdates subscribes to the event bus and makes note of folders that
// need their data recalculated.
func (c *folderSummaryService) listenForUpdates(ctx context.Context) error {
@@ -357,17 +346,6 @@ func (c *folderSummaryService) calculateSummaries(ctx context.Context) error {
// foldersToHandle returns the list of folders needing a summary update, and
// clears the list.
func (c *folderSummaryService) foldersToHandle() []string {
- // We only recalculate summaries if someone is listening to events
- // (a request to /rest/events has been made within the last
- // pingEventInterval).
-
- c.lastEventReqMut.Lock()
- last := c.lastEventReq
- c.lastEventReqMut.Unlock()
- if time.Since(last) > maxDurationSinceLastEventReq {
- return nil
- }
-
c.foldersMut.Lock()
res := make([]string, 0, len(c.folders))
for folder := range c.folders {
diff --git a/lib/syncthing/verboseservice.go b/lib/syncthing/verboseservice.go
index 6f2320485..2cf905ddd 100644
--- a/lib/syncthing/verboseservice.go
+++ b/lib/syncthing/verboseservice.go
@@ -52,7 +52,7 @@ var folderSummaryRemoveDeprecatedRe = regexp.MustCompile(`(Invalid|IgnorePattern
func (*verboseService) formatEvent(ev events.Event) string {
switch ev.Type {
- case events.DownloadProgress, events.LocalIndexUpdated:
+ case events.DownloadProgress:
// Skip
return ""
@@ -86,9 +86,13 @@ func (*verboseService) formatEvent(ev events.Event) string {
data := ev.Data.(map[string]string)
return fmt.Sprintf("Remote change detected in folder %q: %s %s %s", data["folder"], data["action"], data["type"], data["path"])
+ case events.LocalIndexUpdated:
+ data := ev.Data.(map[string]interface{})
+ return fmt.Sprintf("Local index update for %q with %d items (seq: %d)", data["folder"], data["items"], data["sequence"])
+
case events.RemoteIndexUpdated:
data := ev.Data.(map[string]interface{})
- return fmt.Sprintf("Device %v sent an index update for %q with %d items", data["device"], data["folder"], data["items"])
+ return fmt.Sprintf("Device %v sent an index update for %q with %d items (seq: %d)", data["device"], data["folder"], data["items"], data["sequence"])
case events.DeviceRejected:
data := ev.Data.(map[string]string)
@@ -117,7 +121,7 @@ func (*verboseService) formatEvent(ev events.Event) string {
case events.FolderCompletion:
data := ev.Data.(map[string]interface{})
- return fmt.Sprintf("Completion for folder %q on device %v is %v%% (state: %s)", data["folder"], data["device"], data["completion"], data["remoteState"])
+ return fmt.Sprintf("Completion for folder %q on device %v is %v%% (state: %s, seq: %d)", data["folder"], data["device"], data["completion"], data["remoteState"], data["sequence"])
case events.FolderSummary:
data := ev.Data.(model.FolderSummaryEventData)
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion