mirror of
https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git
synced 2026-09-20 08:03:53 +08:00
fix: enable task archivers (#21943)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
@@ -23,6 +23,8 @@ import (
|
||||
|
||||
"yunion.io/x/onecloud/pkg/cloudcommon/cronman"
|
||||
"yunion.io/x/onecloud/pkg/cloudcommon/db"
|
||||
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
|
||||
"yunion.io/x/onecloud/pkg/devtool/options"
|
||||
"yunion.io/x/onecloud/pkg/mcclient"
|
||||
"yunion.io/x/onecloud/pkg/mcclient/auth"
|
||||
"yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
|
||||
@@ -111,7 +113,15 @@ func AddOneCronjob(item *SCronjob, s *mcclient.ClientSession) error {
|
||||
}
|
||||
|
||||
func InitializeCronjobs(ctx context.Context) error {
|
||||
err := taskman.TaskManager.InitializeData()
|
||||
if err != nil {
|
||||
log.Fatalf("TaskManager.InitializeData fail %s", err)
|
||||
}
|
||||
|
||||
DevToolCronManager = cronman.InitCronJobManager(true, 8)
|
||||
|
||||
DevToolCronManager.AddJobAtIntervals("TaskCleanupJob", time.Duration(options.Options.TaskArchiveIntervalHours)*time.Hour, taskman.TaskManager.TaskCleanupJob)
|
||||
|
||||
DevToolCronManager.Start()
|
||||
Session := auth.GetAdminSession(ctx, "")
|
||||
|
||||
|
||||
@@ -24,12 +24,16 @@ import (
|
||||
|
||||
func InitHandlers(app *appsrv.Application) {
|
||||
db.InitAllManagers()
|
||||
|
||||
taskman.InitArchivedTaskManager()
|
||||
taskman.AddTaskHandler("", app)
|
||||
|
||||
for _, manager := range []db.IModelManager{
|
||||
taskman.TaskManager,
|
||||
taskman.SubTaskManager,
|
||||
taskman.TaskObjectManager,
|
||||
taskman.ArchivedTaskManager,
|
||||
|
||||
db.SharedResourceManager,
|
||||
db.UserCacheManager,
|
||||
db.TenantCacheManager,
|
||||
|
||||
@@ -50,7 +50,9 @@ func StartService() {
|
||||
db.EnsureAppSyncDB(app, dbOpts, models.InitDB)
|
||||
defer cloudcommon.CloseDB()
|
||||
|
||||
models.InitializeCronjobs(app.GetContext())
|
||||
if !opts.IsSlaveNode {
|
||||
models.InitializeCronjobs(app.GetContext())
|
||||
}
|
||||
|
||||
app_common.ServeForeverWithCleanup(app, baseOpts, func() {
|
||||
cloudcommon.CloseDB()
|
||||
|
||||
Reference in New Issue
Block a user