From 69769e6203e0d95a2ebbacb76dccc475ef4f8a6d Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Tue, 25 Nov 2025 18:07:19 +0800
Subject: [PATCH] fix: Fix the issue of database connections not being released
 (#11070)

---
 agent/app/service/device_clean.go    | 2 ++
 agent/app/service/snapshot_create.go | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/agent/app/service/device_clean.go b/agent/app/service/device_clean.go
index 5656ca92d..122d6efec 100644
--- a/agent/app/service/device_clean.go
+++ b/agent/app/service/device_clean.go
@@ -647,11 +647,13 @@ func dropTaskLog(logDir string) {
 		if err == nil {
 			_ = xpackDB.Table("tampers").Where("task_id != ?", "").Select("task_id").Find(&usedTasks).Error
 		}
+		defer common.CloseDB(xpackDB)
 	case "System":
 		xpackDB, err := common.LoadDBConnByPathWithErr(path.Join(global.CONF.Base.InstallDir, "1panel/db/xpack.db"), "xpack.db")
 		if err == nil {
 			_ = xpackDB.Model("nodes").Where("task_id != ?", "").Select("task_id").Find(&usedTasks).Error
 		}
+		defer common.CloseDB(xpackDB)
 	default:
 		dropFileOrDir(logDir)
 		_ = taskRepo.Delete(repo.WithByType(taskType))
diff --git a/agent/app/service/snapshot_create.go b/agent/app/service/snapshot_create.go
index e9af6cae7..937c26a95 100644
--- a/agent/app/service/snapshot_create.go
+++ b/agent/app/service/snapshot_create.go
@@ -259,11 +259,12 @@ func loadDbConn(snap *snapHelper, targetDir string, req dto.SnapshotCreate) erro
 			return err
 		}
 	} else {
-		taskDB, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/task.db"), "core.db")
+		taskDB, err := common.LoadDBConnByPathWithErr(path.Join(targetDir, "db/task.db"), "task.db")
 		snap.Task.LogWithStatus(i18n.GetWithName("SnapNewDB", "task"), err)
 		if err != nil {
 			return err
 		}
+		defer common.CloseDB(taskDB)
 		_ = taskDB.Where("id = ?", req.TaskID).Delete(&model.Task{}).Error
 	}
 	if !req.WithOperationLog && global.IsMaster {