From ea65acf6ed1a8cbb3c6d70303da5243852dbc5d5 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Thu, 21 Aug 2025 18:10:39 +0800 Subject: [PATCH] fix(scheduler): add session usage timeout options (#23142) --- pkg/scheduler/models/pending_usage.go | 3 ++- pkg/scheduler/options/options.go | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/scheduler/models/pending_usage.go b/pkg/scheduler/models/pending_usage.go index 9060ffb708..516743b000 100644 --- a/pkg/scheduler/models/pending_usage.go +++ b/pkg/scheduler/models/pending_usage.go @@ -29,6 +29,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" computemodels "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/options" ) var HostPendingUsageManager *SHostPendingUsageManager @@ -527,7 +528,7 @@ func (self *SessionPendingUsage) cancelSelf() { } func (self *SessionPendingUsage) StartTimer() { - timeout := 1 * time.Minute + timeout := time.Duration(options.Options.ExpireSessionUsageTimeout) * time.Second go func() { for { select { diff --git a/pkg/scheduler/options/options.go b/pkg/scheduler/options/options.go index a3d9a61ad2..d00b296ec5 100644 --- a/pkg/scheduler/options/options.go +++ b/pkg/scheduler/options/options.go @@ -52,6 +52,8 @@ type SchedOptions struct { ExpireQueueMaxLength int `help:"Expire queue max length" default:"1000"` ExpireQueueDealLength int `help:"Expire queue deal length" default:"100"` + ExpireSessionUsageTimeout int `help:"Expire Session usage timeout second" default:"60"` + // completed queue options CompletedQueueConsumptionPeriod string `help:"Completed queue consumption period" default:"30s"` CompletedQueueConsumptionTimeout string `help:"Completed queue consumption timeout" default:"30s"`