1 parent
7114e9ed4a
commit
33eab66a50
6 files changed
+383
-25
No files matched your search
@@ -0,0 +1,47 @@
|
||||
//go:build linux
|
||||
|
||||
package release
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestInstallPairPreservesDanglingRecoveryLink(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
backup := filepath.Join(f.target, "release.json.previous")
|
||||
missing := filepath.Join(filepath.Dir(f.target), "missing")
|
||||
if err := os.Symlink(missing, backup); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeBackupConflict) {
|
||||
t.Fatal("悬空备份链接未在升级前拒绝")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
if target, err := os.Readlink(backup); err != nil || target != missing {
|
||||
t.Fatal("悬空备份链接被修改")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairRejectsLinkedTargetEntry(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
f.target = filepath.Join(filepath.Dir(f.target), "linked-bin")
|
||||
if err := os.Mkdir(f.target, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
mainName, _ := executableNames()
|
||||
if err := os.Symlink(f.main, filepath.Join(f.target, mainName)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeDirectory) {
|
||||
t.Fatal("符号链接形式的目标程序未被拒绝")
|
||||
}
|
||||
if data, err := os.ReadFile(f.main); err != nil || string(data) != "new" {
|
||||
t.Fatal("链接指向的外部文件被改写")
|
||||
}
|
||||
if target, err := os.Readlink(filepath.Join(f.target, mainName)); err != nil || target != f.main {
|
||||
t.Fatal("原有目标链接被改写")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,184 @@
|
||||
package release
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"git.pcux.cn/xuans/Smail/internal/buildinfo"
|
||||
)
|
||||
|
||||
type releaseFixture struct {
|
||||
target string
|
||||
main string
|
||||
admin string
|
||||
names []string
|
||||
pair Pair
|
||||
}
|
||||
|
||||
func newReleaseFixture(t *testing.T) releaseFixture {
|
||||
t.Helper()
|
||||
root := t.TempDir()
|
||||
f := releaseFixture{target: filepath.Join(root, "bin"), main: filepath.Join(root, "main-source"), admin: filepath.Join(root, "admin-source")}
|
||||
mainName, adminName := executableNames()
|
||||
f.names = []string{mainName, adminName, "release.json"}
|
||||
info := buildinfo.Info{Version: "v2", GitHash: "abc", ProtocolVersion: buildinfo.ProtocolVersion}
|
||||
f.pair = Pair{Main: info, Admin: info}
|
||||
if err := os.Mkdir(f.target, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, path := range []string{f.main, f.admin} {
|
||||
if err := os.WriteFile(path, []byte("new"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for _, name := range f.names {
|
||||
if err := os.WriteFile(filepath.Join(f.target, name), []byte("old-"+name), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
func assertOldRelease(t *testing.T, f releaseFixture) {
|
||||
t.Helper()
|
||||
for _, name := range f.names {
|
||||
data, err := os.ReadFile(filepath.Join(f.target, name))
|
||||
if err != nil || string(data) != "old-"+name {
|
||||
t.Fatalf("旧版本未完整保留:%s,错误:%v", name, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairPreservesExistingRecoveryBackup(t *testing.T) {
|
||||
mainName, adminName := executableNames()
|
||||
for _, name := range []string{mainName, adminName, "release.json"} {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
backup := filepath.Join(f.target, name+".previous")
|
||||
if err := os.WriteFile(backup, []byte("retained-evidence"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeBackupConflict) {
|
||||
t.Fatal("已有恢复备份时仍执行了升级")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
data, err := os.ReadFile(backup)
|
||||
if err != nil || string(data) != "retained-evidence" {
|
||||
t.Fatal("已有恢复备份被删除或改写")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairRestoresEveryRenameFailure(t *testing.T) {
|
||||
for failure := 1; failure <= 6; failure++ {
|
||||
t.Run(strconv.Itoa(failure), func(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
original := renamePath
|
||||
t.Cleanup(func() { renamePath = original })
|
||||
calls := 0
|
||||
renamePath = func(source, target string) error {
|
||||
calls++
|
||||
if calls == failure {
|
||||
return errors.New("simulated rename failure")
|
||||
}
|
||||
return original(source, target)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeRollback) || errors.Is(err, ErrUpgradeRollbackFailed) {
|
||||
t.Fatal("替换失败没有返回完整回滚状态")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairRollsBackFirstInstallation(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
f.target = filepath.Join(filepath.Dir(f.target), "empty-bin")
|
||||
original := renamePath
|
||||
t.Cleanup(func() { renamePath = original })
|
||||
_, adminName := executableNames()
|
||||
renamePath = func(source, target string) error {
|
||||
if filepath.Base(source) == adminName {
|
||||
return errors.New("simulated first installation failure")
|
||||
}
|
||||
return original(source, target)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeRollback) {
|
||||
t.Fatal("首次安装失败没有回滚")
|
||||
}
|
||||
entries, err := os.ReadDir(f.target)
|
||||
if err != nil || len(entries) != 0 {
|
||||
t.Fatal("首次安装失败后留下不完整程序或备份")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairRejectsDirectoryRecoveryBackup(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
backup := filepath.Join(f.target, "release.json.previous")
|
||||
if err := os.Mkdir(backup, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := InstallPair(f.main, f.admin, f.target, f.pair); !errors.Is(err, ErrUpgradeBackupConflict) {
|
||||
t.Fatal("目录形式的已有备份未被保护")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
if info, err := os.Stat(backup); err != nil || !info.IsDir() {
|
||||
t.Fatal("备份目录被删除或改写")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairDoesNotClaimSuccessfulRollbackWhenRestoreFails(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
original := renamePath
|
||||
t.Cleanup(func() { renamePath = original })
|
||||
mainName, adminName := executableNames()
|
||||
renamePath = func(source, target string) error {
|
||||
if (filepath.Base(source) == adminName && filepath.Dir(source) != f.target) || filepath.Base(source) == mainName+".previous" {
|
||||
return errors.New("simulated install and restore failure")
|
||||
}
|
||||
return original(source, target)
|
||||
}
|
||||
err := InstallPair(f.main, f.admin, f.target, f.pair)
|
||||
if !errors.Is(err, ErrUpgradeRollbackFailed) || errors.Is(err, ErrUpgradeRollback) {
|
||||
t.Fatal("恢复失败仍被标记为回滚成功")
|
||||
}
|
||||
data, readErr := os.ReadFile(filepath.Join(f.target, mainName+".previous"))
|
||||
if readErr != nil || string(data) != "old-"+mainName {
|
||||
t.Fatal("恢复失败后未保留旧版本备份")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstallPairReportsRollbackDurabilityFailure(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
original := syncReleaseDirectory
|
||||
t.Cleanup(func() { syncReleaseDirectory = original })
|
||||
syncReleaseDirectory = func(string) error { return errors.New("simulated directory sync failure") }
|
||||
err := InstallPair(f.main, f.admin, f.target, f.pair)
|
||||
if !errors.Is(err, ErrUpgradeRollbackFailed) || errors.Is(err, ErrUpgradeRollback) {
|
||||
t.Fatal("回滚持久化失败没有报告恢复未完成")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
}
|
||||
|
||||
func TestInstallPairRestoresAfterCommitSyncFailure(t *testing.T) {
|
||||
f := newReleaseFixture(t)
|
||||
original := syncReleaseDirectory
|
||||
t.Cleanup(func() { syncReleaseDirectory = original })
|
||||
calls := 0
|
||||
syncReleaseDirectory = func(path string) error {
|
||||
calls++
|
||||
if calls == 1 {
|
||||
return errors.New("simulated commit sync failure")
|
||||
}
|
||||
return original(path)
|
||||
}
|
||||
err := InstallPair(f.main, f.admin, f.target, f.pair)
|
||||
if !errors.Is(err, ErrUpgradeRollback) || errors.Is(err, ErrUpgradeRollbackFailed) {
|
||||
t.Fatal("持久化失败后的完整回滚状态错误")
|
||||
}
|
||||
assertOldRelease(t, f)
|
||||
}
|
||||
@@ -15,9 +15,11 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
ErrInvalidPair = errors.New("invalid release pair")
|
||||
ErrUpgradeRollback = errors.New("release upgrade rolled back")
|
||||
ErrUpgradeDirectory = errors.New("release target directory is invalid")
|
||||
ErrInvalidPair = errors.New("invalid release pair")
|
||||
ErrUpgradeRollback = errors.New("release upgrade rolled back")
|
||||
ErrUpgradeRollbackFailed = errors.New("release rollback incomplete; preserve backups for manual recovery")
|
||||
ErrUpgradeBackupConflict = errors.New("release recovery backup already exists")
|
||||
ErrUpgradeDirectory = errors.New("release target directory is invalid")
|
||||
)
|
||||
|
||||
type Manifest struct {
|
||||
@@ -111,51 +113,75 @@ func InstallPair(mainSource, adminSource, targetDir string, pair Pair) error {
|
||||
return replacePair(stage, targetDir, []string{mainName, adminName, "release.json"})
|
||||
}
|
||||
|
||||
var renamePath = os.Rename
|
||||
var (
|
||||
renamePath = os.Rename
|
||||
syncReleaseDirectory = syncDirectory
|
||||
)
|
||||
|
||||
func replacePair(stage, targetDir string, names []string) error {
|
||||
committed := make([]string, 0, len(names))
|
||||
// 先检查所有备份,不能因升级新版本而删除上次未完成恢复的证据。
|
||||
for _, name := range names {
|
||||
target := filepath.Join(targetDir, name)
|
||||
if _, err := os.Lstat(target + ".previous"); err == nil {
|
||||
return fmt.Errorf("%w: %s", ErrUpgradeBackupConflict, name)
|
||||
} else if !os.IsNotExist(err) {
|
||||
return fmt.Errorf("inspect recovery backup %s: %w", name, err)
|
||||
}
|
||||
if info, err := os.Lstat(target); err == nil {
|
||||
if !info.Mode().IsRegular() {
|
||||
return fmt.Errorf("%w: %s", ErrUpgradeDirectory, name)
|
||||
}
|
||||
} else if !os.IsNotExist(err) {
|
||||
return fmt.Errorf("inspect release target %s: %w", name, err)
|
||||
}
|
||||
}
|
||||
committed := make(map[string]bool, len(names))
|
||||
backups := make(map[string]string, len(names))
|
||||
rollback := func() {
|
||||
for index := len(committed) - 1; index >= 0; index-- {
|
||||
name := committed[index]
|
||||
rollback := func(cause error) error {
|
||||
var failures []error
|
||||
for index := len(names) - 1; index >= 0; index-- {
|
||||
name := names[index]
|
||||
target := filepath.Join(targetDir, name)
|
||||
_ = os.Remove(target)
|
||||
if committed[name] {
|
||||
if err := os.Remove(target); err != nil {
|
||||
failures = append(failures, fmt.Errorf("remove replacement %s: %w", name, err))
|
||||
continue
|
||||
}
|
||||
}
|
||||
if backup, ok := backups[name]; ok {
|
||||
_ = renamePath(backup, target)
|
||||
if err := renamePath(backup, target); err != nil {
|
||||
failures = append(failures, fmt.Errorf("restore %s: %w", name, err))
|
||||
}
|
||||
}
|
||||
}
|
||||
for name, backup := range backups {
|
||||
if _, err := os.Stat(filepath.Join(targetDir, name)); os.IsNotExist(err) {
|
||||
_ = renamePath(backup, filepath.Join(targetDir, name))
|
||||
}
|
||||
if err := syncReleaseDirectory(targetDir); err != nil {
|
||||
failures = append(failures, fmt.Errorf("sync restored release: %w", err))
|
||||
}
|
||||
if len(failures) != 0 {
|
||||
return errors.Join(cause, ErrUpgradeRollbackFailed, errors.Join(failures...))
|
||||
}
|
||||
return errors.Join(cause, ErrUpgradeRollback)
|
||||
}
|
||||
|
||||
for _, name := range names {
|
||||
target := filepath.Join(targetDir, name)
|
||||
if _, err := os.Stat(target); err == nil {
|
||||
backup := target + ".previous"
|
||||
_ = os.Remove(backup)
|
||||
if err := renamePath(target, backup); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("backup %s: %w", name, err)
|
||||
return rollback(fmt.Errorf("backup %s: %w", name, err))
|
||||
}
|
||||
backups[name] = backup
|
||||
} else if !os.IsNotExist(err) {
|
||||
rollback()
|
||||
return fmt.Errorf("inspect %s: %w", name, err)
|
||||
return rollback(fmt.Errorf("inspect %s: %w", name, err))
|
||||
}
|
||||
if err := renamePath(filepath.Join(stage, name), target); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("install %s: %w: %w", name, err, ErrUpgradeRollback)
|
||||
return rollback(fmt.Errorf("install %s: %w", name, err))
|
||||
}
|
||||
committed = append(committed, name)
|
||||
committed[name] = true
|
||||
}
|
||||
|
||||
if err := syncDirectory(targetDir); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("sync release target: %w: %w", err, ErrUpgradeRollback)
|
||||
if err := syncReleaseDirectory(targetDir); err != nil {
|
||||
return rollback(fmt.Errorf("sync release target: %w", err))
|
||||
}
|
||||
for _, backup := range backups {
|
||||
// 备份清理失败不回滚已经持久化的新版本,避免把升级结果置于不一致状态。
|
||||
|
||||
Reference in new issue
Block a user