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

lib/db: Add mechanism to repair db without schema update (ref #7044) (#7047)

Browse Source
This commit is contained in:
Simon Frei 2020-10-21 14:21:09 +02:00 committed by GitHub
parent 5c91723ef2
commit 2ba3be5e4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/db/schemaupdater.go
View File

@ -28,8 +28,12 @@ import (
// 10-11: v1.6.0 // 10-11: v1.6.0
// 12-13: v1.7.0 // 12-13: v1.7.0
// 14: v1.9.0 // 14: v1.9.0
//
// dbMigrationVersion is for migrations that do not change the schema and thus
// do not put restrictions on downgrades (e.g. for repairs after a bugfix).
const ( const (
dbVersion = 14 dbVersion = 14
dbMigrationVersion = 15
dbMinSyncthingVersion = "v1.9.0" dbMinSyncthingVersion = "v1.9.0"
) )
@ -46,6 +50,8 @@ func (e *databaseDowngradeError) Error() string {
return fmt.Sprintf("Syncthing %s required", e.minSyncthingVersion) return fmt.Sprintf("Syncthing %s required", e.minSyncthingVersion)
} }
// UpdateSchema updates a possibly outdated database to the current schema and
// also does repairs where necessary.
func UpdateSchema(db *Lowlevel) error { func UpdateSchema(db *Lowlevel) error {
updater := &schemaUpdater{db} updater := &schemaUpdater{db}
return updater.updateSchema() return updater.updateSchema()
@ -77,33 +83,44 @@ func (db *schemaUpdater) updateSchema() error {
return err return err
} }
if prevVersion == dbVersion { prevMigration, _, err := miscDB.Int64("dbMigrationVersion")
if err != nil {
return err
}
// Cover versions before adding `dbMigrationVersion` (== 0) and possible future weirdness.
if prevMigration < prevVersion {
prevMigration = prevVersion
}
if prevVersion == dbVersion && prevMigration >= dbMigrationVersion {
return nil return nil
} }
type migration struct { type migration struct {
schemaVersion int64 schemaVersion int64
migration func(prevVersion int) error migrationVersion int64
migration func(prevSchema int) error
} }
var migrations = []migration{ var migrations = []migration{
{1, db.updateSchema0to1}, {1, 1, db.updateSchema0to1},
{2, db.updateSchema1to2}, {2, 2, db.updateSchema1to2},
{3, db.updateSchema2to3}, {3, 3, db.updateSchema2to3},
{5, db.updateSchemaTo5}, {5, 5, db.updateSchemaTo5},
{6, db.updateSchema5to6}, {6, 6, db.updateSchema5to6},
{7, db.updateSchema6to7}, {7, 7, db.updateSchema6to7},
{9, db.updateSchemaTo9}, {9, 9, db.updateSchemaTo9},
{10, db.updateSchemaTo10}, {10, 10, db.updateSchemaTo10},
{11, db.updateSchemaTo11}, {11, 11, db.updateSchemaTo11},
{13, db.updateSchemaTo13}, {13, 13, db.updateSchemaTo13},
{14, db.updateSchemaTo14}, {14, 14, db.updateSchemaTo14},
{14, 15, db.migration15},
} }
for _, m := range migrations { for _, m := range migrations {
if prevVersion < m.schemaVersion { if prevMigration < m.migrationVersion {
l.Infof("Migrating database to schema version %d...", m.schemaVersion) l.Infof("Running database migration %d...", m.migrationVersion)
if err := m.migration(int(prevVersion)); err != nil { if err := m.migration(int(prevVersion)); err != nil {
return fmt.Errorf("failed migrating to version %v: %w", m.schemaVersion, err) return fmt.Errorf("failed to do migration %v: %w", m.migrationVersion, err)
} }
} }
} }
@ -114,6 +131,9 @@ func (db *schemaUpdater) updateSchema() error {
if err := miscDB.PutString("dbMinSyncthingVersion", dbMinSyncthingVersion); err != nil { if err := miscDB.PutString("dbMinSyncthingVersion", dbMinSyncthingVersion); err != nil {
return err return err
} }
if err := miscDB.PutInt64("dbMigrationVersion", dbMigrationVersion); err != nil {
return err
}
l.Infoln("Compacting database after migration...") l.Infoln("Compacting database after migration...")
return db.Compact() return db.Compact()
@ -749,6 +769,15 @@ func (db *schemaUpdater) updateSchemaTo14(_ int) error {
return nil return nil
} }
func (db *schemaUpdater) migration15(_ int) error {
for _, folder := range db.ListFolders() {
if _, err := db.recalcMeta(folder); err != nil {
return err
}
}
return nil
}
func (db *schemaUpdater) rewriteGlobals(t readWriteTransaction) error { func (db *schemaUpdater) rewriteGlobals(t readWriteTransaction) error {
it, err := t.NewPrefixIterator([]byte{KeyTypeGlobal}) it, err := t.NewPrefixIterator([]byte{KeyTypeGlobal})
if err != nil { if err != nil {