starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-10-12 16:00:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve database file handling

Browse Source
This commit is contained in:
ssongliu
2026-10-12 18:06:47 +08:00
parent f7394938f7
commit 223c030eb8
6 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/snapshot_recover.go
+3
View File
@@ -494,6 +494,9 @@ func restartCompose(composePath string, itemHelper *snapRecoverHelper) error {
func recoverDBData(src string, itemHelper *snapRecoverHelper) error {
itemHelper.Task.Log("---------------------- 11 / 11 ----------------------")
itemHelper.Task.LogStart(i18n.GetMsgByKey("RecoverDBData"))
if err := os.Chmod(src, 0700); err != nil {
return err
}
dbDir := path.Join(global.Dir.DataDir, "db")
if err := os.RemoveAll(dbDir); err != nil {
itemHelper.Task.LogWithStatus(i18n.GetMsgByKey("RecoverDBData"), err)
agent/app/service/snapshot_rollback.go
+3
View File
@@ -106,6 +106,9 @@ func (u *SnapshotService) SnapshotRollback(req dto.SnapshotRecover) error {
taskItem.AddSubTask(
i18n.GetWithName("SnapCopy", global.Dir.BaseDir),
func(t *task.Task) error {
if err := os.Chmod(path.Join(rootDir, "1panel/db"), 0700); err != nil {
return err
}
return FileOp.CopyDir(path.Join(rootDir, "1panel"), global.Dir.BaseDir)
},
nil,
agent/utils/common/sqlite.go
+25 -38
View File
@@ -7,43 +7,20 @@ import (
"path"
"time"
"github.com/1Panel-dev/1Panel/agent/global"
"github.com/glebarez/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)
func LoadDBConnByPath(fullPath, dbName string) *gorm.DB {
if _, err := createDirWhenNotExist(true, path.Dir(fullPath)); err != nil {
panic(fmt.Errorf("init db dir failed, err: %v", err))
}
if _, err := os.Stat(fullPath); err != nil {
f, err := os.Create(fullPath)
if err != nil {
panic(fmt.Errorf("init %s db file failed, err: %v", dbName, err))
}
_ = f.Close()
}
db, err := GetDBWithPath(fullPath)
if err != nil {
panic(err)
panic(fmt.Errorf("init %s db failed, err: %w", dbName, err))
}
return db
}
func LoadDBConnByPathWithErr(fullPath, dbName string) (*gorm.DB, error) {
if _, err := createDirWhenNotExist(true, path.Dir(fullPath)); err != nil {
return nil, fmt.Errorf("init db dir failed, err: %v", err)
}
if _, err := os.Stat(fullPath); err != nil {
f, err := os.Create(fullPath)
if err != nil {
return nil, fmt.Errorf("init %s db file failed, err: %v", dbName, err)
}
_ = f.Close()
}
db, err := GetDBWithPath(fullPath)
if err != nil {
return nil, fmt.Errorf("init %s db failed, err: %v", dbName, err)
@@ -60,6 +37,30 @@ func CloseDB(db *gorm.DB) {
}
func GetDBWithPath(dbPath string) (*gorm.DB, error) {
dbDir := path.Dir(dbPath)
if err := os.MkdirAll(dbDir, 0700); err != nil {
return nil, fmt.Errorf("init db dir failed, err: %w", err)
}
if err := os.Chmod(dbDir, 0700); err != nil {
return nil, fmt.Errorf("set db dir permissions failed, err: %w", err)
}
file, err := os.OpenFile(dbPath, os.O_CREATE|os.O_RDWR, 0600)
if err != nil {
return nil, fmt.Errorf("init db file failed, err: %w", err)
}
if err := file.Chmod(0600); err != nil {
_ = file.Close()
return nil, fmt.Errorf("set db file permissions failed, err: %w", err)
}
if err := file.Close(); err != nil {
return nil, err
}
for _, suffix := range []string{"-wal", "-shm", "-journal"} {
if err := os.Chmod(dbPath+suffix, 0600); err != nil && !os.IsNotExist(err) {
return nil, fmt.Errorf("set db sidecar permissions failed, err: %w", err)
}
}
db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
DisableForeignKeyConstraintWhenMigrating: true,
Logger: newLogger(),
@@ -104,17 +105,3 @@ func newLogger() logger.Interface {
},
)
}
func createDirWhenNotExist(isDir bool, pathItem string) (string, error) {
checkPath := pathItem
if !isDir {
checkPath = path.Dir(pathItem)
}
if _, err := os.Stat(checkPath); err != nil && os.IsNotExist(err) {
if err = os.MkdirAll(checkPath, os.ModePerm); err != nil {
global.LOG.Errorf("mkdir %s failed, err: %v", checkPath, err)
return pathItem, err
}
}
return pathItem, nil
}
core/app/service/upgrade.go
+3 -1
View File
@@ -495,7 +495,9 @@ func (u *UpgradeService) handleRollback(originalDir string, errStep int, svcInfo
_ = settingRepo.Update("SystemStatus", "Free")
dbPath := path.Join(global.CONF.Base.InstallDir, "1panel")
if _, err := os.Stat(path.Join(originalDir, "db")); err == nil {
if err := files.CopyItem(true, true, path.Join(originalDir, "db"), dbPath); err != nil {
if err := os.Chmod(path.Join(originalDir, "db"), 0700); err != nil {
global.LOG.Errorf("set rollback db dir permissions failed, err: %v", err)
} else if err := files.CopyItem(true, true, path.Join(originalDir, "db"), dbPath); err != nil {
global.LOG.Errorf("rollback 1panel db failed, err: %v", err)
}
}
core/cmd/server/cmd/restore.go
+3
View File
@@ -91,6 +91,9 @@ var restoreCmd = &cobra.Command{
}
fmt.Println(i18n.GetMsgByKeyForCmd("RestoreStep4"))
if _, err := os.Stat(path.Join(tmpPath, "db")); err == nil {
if err := os.Chmod(path.Join(tmpPath, "db"), 0700); err != nil {
return err
}
dbPath := path.Join(baseDir, "1panel")
targetDBDir := path.Join(dbPath, "db")
if err := os.RemoveAll(targetDBDir); err != nil {
core/utils/common/sqlite.go
+25 -12
View File
@@ -13,20 +13,9 @@ import (
)
func LoadDBConnByPath(fullPath, dbName string) *gorm.DB {
if _, err := CreateDirWhenNotExist(true, path.Dir(fullPath)); err != nil {
panic(fmt.Errorf("init db dir failed, err: %v", err))
}
if _, err := os.Stat(fullPath); err != nil {
f, err := os.Create(fullPath)
if err != nil {
panic(fmt.Errorf("init %s db file failed, err: %v", dbName, err))
}
_ = f.Close()
}
db, err := GetDBWithPath(fullPath)
if err != nil {
panic(err)
panic(fmt.Errorf("init %s db failed, err: %w", dbName, err))
}
return db
}
@@ -40,6 +29,30 @@ func CloseDB(db *gorm.DB) {
}
func GetDBWithPath(dbPath string) (*gorm.DB, error) {
dbDir := path.Dir(dbPath)
if err := os.MkdirAll(dbDir, 0700); err != nil {
return nil, fmt.Errorf("init db dir failed, err: %w", err)
}
if err := os.Chmod(dbDir, 0700); err != nil {
return nil, fmt.Errorf("set db dir permissions failed, err: %w", err)
}
file, err := os.OpenFile(dbPath, os.O_CREATE|os.O_RDWR, 0600)
if err != nil {
return nil, fmt.Errorf("init db file failed, err: %w", err)
}
if err := file.Chmod(0600); err != nil {
_ = file.Close()
return nil, fmt.Errorf("set db file permissions failed, err: %w", err)
}
if err := file.Close(); err != nil {
return nil, err
}
for _, suffix := range []string{"-wal", "-shm", "-journal"} {
if err := os.Chmod(dbPath+suffix, 0600); err != nil && !os.IsNotExist(err) {
return nil, fmt.Errorf("set db sidecar permissions failed, err: %w", err)
}
}
db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
DisableForeignKeyConstraintWhenMigrating: true,
Logger: newLogger(),