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

Fixed database locking issue when importing

Browse Source
This commit is contained in:
Stash Dev
2019-02-10 12:47:34 -08:00
parent 47e788ad64
commit 57307bfd01
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
database/database.go
View File

@@ -9,6 +9,7 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"github.com/stashapp/stash/logger" "github.com/stashapp/stash/logger"
"github.com/stashapp/stash/utils" "github.com/stashapp/stash/utils"
"os"
) )
var DB *sqlx.DB var DB *sqlx.DB
@@ -19,7 +20,8 @@ func Initialize(databasePath string) {
// https://github.com/mattn/go-sqlite3 // https://github.com/mattn/go-sqlite3
conn, err := sqlx.Open("sqlite3", "file:"+databasePath+"?_fk=true") conn, err := sqlx.Open("sqlite3", "file:"+databasePath+"?_fk=true")
conn.SetMaxOpenConns(10) conn.SetMaxOpenConns(25)
conn.SetMaxIdleConns(4)
if err != nil { if err != nil {
logger.Fatalf("db.Open(): %q\n", err) logger.Fatalf("db.Open(): %q\n", err)
} }
@@ -27,12 +29,9 @@ func Initialize(databasePath string) {
} }
func Reset(databasePath string) { func Reset(databasePath string) {
_, _ = DB.Exec("PRAGMA writable_schema = 1;") _ = DB.Close()
_, _ = DB.Exec("delete from sqlite_master where type in ('table', 'index', 'trigger');") _ = os.Remove(databasePath)
_, _ = DB.Exec("PRAGMA writable_schema = 0;") Initialize(databasePath)
_, _ = DB.Exec("VACUUM;")
_, _ = DB.Exec("PRAGMA INTEGRITY_CHECK;")
runMigrations(databasePath)
} }
// Migrate the database // Migrate the database

2
manager/task_export.go
View File

@@ -41,6 +41,7 @@ func (t *ExportTask) Start(wg *sync.WaitGroup) {
func (t *ExportTask) ExportScenes(ctx context.Context) { func (t *ExportTask) ExportScenes(ctx context.Context) {
tx := database.DB.MustBeginTx(ctx, nil) tx := database.DB.MustBeginTx(ctx, nil)
defer tx.Commit()
qb := models.NewSceneQueryBuilder() qb := models.NewSceneQueryBuilder()
studioQB := models.NewStudioQueryBuilder() studioQB := models.NewStudioQueryBuilder()
galleryQB := models.NewGalleryQueryBuilder() galleryQB := models.NewGalleryQueryBuilder()
@@ -321,6 +322,7 @@ func (t *ExportTask) ExportStudios(ctx context.Context) {
func (t *ExportTask) ExportScrapedItems(ctx context.Context) { func (t *ExportTask) ExportScrapedItems(ctx context.Context) {
tx := database.DB.MustBeginTx(ctx, nil) tx := database.DB.MustBeginTx(ctx, nil)
defer tx.Commit()
qb := models.NewScrapedItemQueryBuilder() qb := models.NewScrapedItemQueryBuilder()
sqb := models.NewStudioQueryBuilder() sqb := models.NewStudioQueryBuilder()
scrapedItems, err := qb.All() scrapedItems, err := qb.All()