Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/db: Checkpoint during schema updates (fixes #6422) #6424

Merged
merged 2 commits into from Mar 18, 2020
Merged

lib/db: Checkpoint during schema updates (fixes #6422) #6424

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4974ded
lib/db: Checkpoint during schema updates (fixes #6422)
imsodin Mar 18, 2020
9c7694a
shame
imsodin Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions lib/db/schemaupdater.go
View file
Open in desktop
Expand Up @@ -201,6 +201,9 @@ func (db *schemaUpdater) updateSchema0to1(_ int) error {
ignAdded++
}
}
if err := t.Checkpoint(); err != nil {
return err
}
}

for folder := range changedFolders {
Expand Down Expand Up @@ -339,7 +342,7 @@ func (db *schemaUpdater) updateSchema5to6(_ int) error {

for _, folderStr := range db.ListFolders() {
folder := []byte(folderStr)
var putErr error
var iterErr error
err := t.withHave(folder, protocol.LocalDeviceID[:], nil, false, func(f FileIntf) bool {
if !f.IsInvalid() {
return true
Expand All @@ -350,16 +353,18 @@ func (db *schemaUpdater) updateSchema5to6(_ int) error {
fi.LocalFlags = protocol.FlagLocalIgnored
bs, _ := fi.Marshal()

dk, putErr = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], []byte(fi.Name))
if putErr != nil {
dk, iterErr = db.keyer.GenerateDeviceFileKey(dk, folder, protocol.LocalDeviceID[:], []byte(fi.Name))
if iterErr != nil {
return false
}
putErr = t.Put(dk, bs)

return putErr == nil
if iterErr = t.Put(dk, bs); iterErr == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!=

return false
}
iterErr = t.Checkpoint()
return iterErr == nil
})
if putErr != nil {
return putErr
if iterErr != nil {
return iterErr
}
if err != nil {
return err
Expand Down Expand Up @@ -421,6 +426,9 @@ func (db *schemaUpdater) updateSchema6to7(_ int) error {
if err != nil {
return err
}
if err := t.Checkpoint(); err != nil {
return err
}
}
return t.Commit()
}
Expand Down Expand Up @@ -460,6 +468,9 @@ func (db *schemaUpdater) updateSchemato9(prev int) error {
if err := t.putFile(it.Key(), fi); err != nil {
return err
}
if err := t.Checkpoint(); err != nil {
return err
}
}
it.Release()
if err := it.Error(); err != nil {
Expand Down