From 8c8167a4ab3130c69bebcd53e0c11934fbc8e939 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 11 Mar 2024 07:30:21 +0100 Subject: [PATCH] lib/model: Don't bump seq on error in index handler (#9459) --- lib/model/indexhandler.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/model/indexhandler.go b/lib/model/indexhandler.go index efa2754a9..e8572789b 100644 --- a/lib/model/indexhandler.go +++ b/lib/model/indexhandler.go @@ -293,7 +293,9 @@ func (s *indexHandler) sendIndexTo(ctx context.Context, fset *db.FileSet) error return err } - err = batch.Flush() + if err := batch.Flush(); err != nil { + return err + } // Use the sequence of the snapshot we iterated as a starting point for the // next run. Previously we used the sequence of the last file we sent, @@ -302,7 +304,7 @@ func (s *indexHandler) sendIndexTo(ctx context.Context, fset *db.FileSet) error // reverted). No point trying to send nothing again. s.prevSequence = snap.Sequence(protocol.LocalDeviceID) - return err + return nil } func (s *indexHandler) receive(fs []protocol.FileInfo, update bool, op string) error {