Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Files Refactor] Migration fix (#2796)

Browse Source 
* Fix large wal file during migration
* Fix migration dropping / from network share paths
This commit is contained in:
WithoutPants
2022-08-02 15:12:01 +10:00
parent bc47932343
commit 5843fdcecc
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/sqlite/migrations/32_postmigrate.go
View File

@@ -86,6 +86,22 @@ func (m *schema32Migrator) migrateFolderSlashes(ctx context.Context) error {
return nil
}
// dir returns all but the last element of path, typically the path's directory.
// After dropping the final element using Split, the path is Cleaned and trailing
// slashes are removed.
//
// This is a re-implementation of path.Dir which changes double slash prefixed
// paths into single slash.
func dir(p string) string {
parent := path.Dir(p)
// restore the double slash
if strings.HasPrefix(p, "//") && len(parent) > 1 {
parent = "/" + parent
}
return parent
}
func (m *schema32Migrator) migrateFolders(ctx context.Context) error {
if err := m.migrateFolderSlashes(ctx); err != nil {
return err
@@ -110,7 +126,7 @@ func (m *schema32Migrator) migrateFolders(ctx context.Context) error {
return err
}
parent := path.Dir(p)
parent := dir(p)
parentID, zipFileID, err := m.createFolderHierarchy(parent)
if err != nil {
return err
@@ -183,7 +199,7 @@ func (m *schema32Migrator) migrateFiles(ctx context.Context) error {
}
convertedPath := filepath.ToSlash(p)
parent := path.Dir(convertedPath)
parent := dir(convertedPath)
basename := path.Base(convertedPath)
if parent != "." {
parentID, zipFileID, err := m.createFolderHierarchy(parent)
@@ -212,6 +228,11 @@ func (m *schema32Migrator) migrateFiles(ctx context.Context) error {
if count%logEvery == 0 {
logger.Infof("Migrated %d files", count)
// manual checkpoint to flush wal file
if _, err := m.db.Exec("PRAGMA wal_checkpoint(FULL)"); err != nil {
return fmt.Errorf("running wal checkpoint: %w", err)
}
}
}
@@ -249,7 +270,7 @@ func (m *schema32Migrator) deletePlaceholderFolder(ctx context.Context) error {
}
func (m *schema32Migrator) createFolderHierarchy(p string) (*int, sql.NullInt64, error) {
parent := path.Dir(p)
parent := dir(p)
if parent == "." || parent == "/" {
// get or create this folder