fix(website): skip runtime archive for websites on a local PHP runtime (#14409)

A PHP runtime whose source is "local" has no directory under
/opt/1panel/runtime/php, so backing up a website that uses it fails
with "tar: <name>: Cannot stat: No such file or directory". Skip the
runtime archive for local runtimes on backup, and skip the runtime
restore on recover, since such a backup never contains one.

Refs #13900
This commit is contained in:
Wei-Lun Li
2026-11-13 18:28:09 +08:00
committed by GitHub
parent 136aad54da
commit aea4de1c77
2 changed files with 90 additions and 9 deletions
+14 -9
View File
@@ -156,12 +156,14 @@ func handleWebsiteRecover(website *model.Website, parentTask *task.Task, recover
if err != nil {
return err
}
taskName := task.GetTaskName(runtime.Name, task.TaskRecover, task.TaskScopeRuntime)
t.LogStart(taskName)
if err := handleRuntimeRecover(runtime, fmt.Sprintf("%s/%s.runtime.tar.gz", tmpPath, website.Alias), true, ""); err != nil {
return err
if runtime.Resource != constant.ResourceLocal {
taskName := task.GetTaskName(runtime.Name, task.TaskRecover, task.TaskScopeRuntime)
t.LogStart(taskName)
if err := handleRuntimeRecover(runtime, fmt.Sprintf("%s/%s.runtime.tar.gz", tmpPath, website.Alias), true, ""); err != nil {
return err
}
t.LogSuccess(taskName)
}
t.LogSuccess(taskName)
if oldWebsite.DbID > 0 {
if err := recoverWebsiteDatabase(t, oldWebsite.DbID, oldWebsite.DbType, tmpPath, website.Alias); err != nil {
return err
@@ -282,11 +284,14 @@ func doWebsiteBackup(website *model.Website, parentTask *task.Task, backupDir, f
if err != nil {
return err
}
parentTask.LogStart(task.GetTaskName(runtime.Name, task.TaskBackup, task.TaskScopeRuntime))
if err = handleRuntimeBackup(runtime, tmpDir, fmt.Sprintf("%s.runtime.tar.gz", website.Alias), excludes, ""); err != nil {
return err
// A local PHP runtime is not managed by 1Panel and has no runtime directory to back up.
if runtime.Resource != constant.ResourceLocal {
parentTask.LogStart(task.GetTaskName(runtime.Name, task.TaskBackup, task.TaskScopeRuntime))
if err = handleRuntimeBackup(runtime, tmpDir, fmt.Sprintf("%s.runtime.tar.gz", website.Alias), excludes, ""); err != nil {
return err
}
parentTask.LogSuccess(task.GetTaskName(runtime.Name, task.TaskBackup, task.TaskScopeRuntime))
}
parentTask.LogSuccess(task.GetTaskName(runtime.Name, task.TaskBackup, task.TaskScopeRuntime))
if website.DbID > 0 {
if err = backupDatabaseWithTask(parentTask, website.DbType, tmpDir, website.Alias, website.DbID); err != nil {
return err
+76
View File
@@ -0,0 +1,76 @@
package service
import (
"io"
"os"
"path/filepath"
"testing"
"github.com/1Panel-dev/1Panel/agent/app/model"
"github.com/1Panel-dev/1Panel/agent/app/task"
"github.com/1Panel-dev/1Panel/agent/constant"
"github.com/1Panel-dev/1Panel/agent/global"
"github.com/glebarez/sqlite"
goi18n "github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/sirupsen/logrus"
"golang.org/x/text/language"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)
func TestWebsiteBackupWithLocalPHPRuntime(t *testing.T) {
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "backup.db")), &gorm.Config{
Logger: logger.Default.LogMode(logger.Silent),
})
if err != nil {
t.Fatal(err)
}
if err := db.AutoMigrate(&model.Setting{}, &model.Runtime{}, &model.Website{}); err != nil {
t.Fatal(err)
}
baseDir := t.TempDir()
oldDB, oldDir, oldLog, oldI18n := global.DB, global.Dir, global.LOG, global.I18n
global.DB = db
global.Dir = global.SystemDir{DataDir: baseDir, RuntimeDir: filepath.Join(baseDir, "runtime")}
global.LOG = logrus.New()
global.LOG.SetOutput(io.Discard)
global.I18n = goi18n.NewLocalizer(goi18n.NewBundle(language.English), "en")
t.Cleanup(func() {
global.DB, global.Dir, global.LOG, global.I18n = oldDB, oldDir, oldLog, oldI18n
if sqlDB, err := db.DB(); err == nil {
_ = sqlDB.Close()
}
})
// Creating any PHP runtime makes <runtime dir>/php, but a local runtime gets no directory of its own.
if err := os.MkdirAll(filepath.Join(global.Dir.RuntimeDir, constant.RuntimePHP), 0755); err != nil {
t.Fatal(err)
}
runtime := model.Runtime{Name: "php81l", Type: constant.RuntimePHP, Resource: constant.ResourceLocal, Version: "8.1", Status: constant.StatusNormal}
if err := db.Create(&runtime).Error; err != nil {
t.Fatal(err)
}
website := model.Website{PrimaryDomain: "local-php.test", Alias: "local-php.test", Type: constant.Runtime, RuntimeID: runtime.ID}
if err := db.Create(&website).Error; err != nil {
t.Fatal(err)
}
confPath := GetWebsiteConfigPath(website)
indexPath := filepath.Join(GetSitePath(website, SiteIndexDir), "index.php")
for file, content := range map[string]string{confPath: "server {}\n", indexPath: "<?php echo 'ok';\n"} {
if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(file, []byte(content), 0644); err != nil {
t.Fatal(err)
}
}
backupDir := t.TempDir()
if err := doWebsiteBackup(&website, &task.Task{Logger: global.LOG}, backupDir, "local-php.test.tar.gz", "", ""); err != nil {
t.Fatalf("backup of a website on a local PHP runtime failed: %v", err)
}
if _, err := os.Stat(filepath.Join(backupDir, "local-php.test.tar.gz")); err != nil {
t.Fatal(err)
}
}