From a52c9b8a3bf2a3ebabe8507472770bec60a2e52c Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Thu, 26 Mar 2026 12:25:46 +0800 Subject: [PATCH] fix(region): order containers by created_at time (#24569) --- pkg/compute/models/cloudsync.go | 2 +- pkg/compute/models/containers.go | 2 +- pkg/compute/models/guest_queries.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/cloudsync.go b/pkg/compute/models/cloudsync.go index 1bd6fe1df3..88078cf875 100644 --- a/pkg/compute/models/cloudsync.go +++ b/pkg/compute/models/cloudsync.go @@ -1335,7 +1335,7 @@ func (self *SGuest) SyncVMIsolateDevices(ctx context.Context, userCred mcclient. } func (guest *SGuest) GetContainers() ([]SContainer, error) { - q := GetContainerManager().Query().Equals("guest_id", guest.Id) + q := GetContainerManager().Query().Equals("guest_id", guest.Id).Asc("created_at") ret := []SContainer{} err := db.FetchModelObjects(GetContainerManager(), q, &ret) if err != nil { diff --git a/pkg/compute/models/containers.go b/pkg/compute/models/containers.go index 19cf02edd7..3b37ed67a2 100644 --- a/pkg/compute/models/containers.go +++ b/pkg/compute/models/containers.go @@ -142,7 +142,7 @@ func (m *SContainerManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQue } func (m *SContainerManager) GetContainersByPod(guestId string) ([]SContainer, error) { - q := m.Query().Equals("guest_id", guestId) + q := m.Query().Equals("guest_id", guestId).Asc("created_at") ctrs := make([]SContainer, 0) if err := db.FetchModelObjects(m, q, &ctrs); err != nil { return nil, errors.Wrap(err, "db.FetchModelObjects") diff --git a/pkg/compute/models/guest_queries.go b/pkg/compute/models/guest_queries.go index ab062d9c5d..f40310669d 100644 --- a/pkg/compute/models/guest_queries.go +++ b/pkg/compute/models/guest_queries.go @@ -928,7 +928,7 @@ func fetchGuestBackupInfo(hostIds []string) (map[string]api.BackupInfo, error) { func fetchContainers(guestIds []string) (map[string][]*api.PodContainerDesc, error) { ret := map[string][]*api.PodContainerDesc{} containers := []SContainer{} - err := GetContainerManager().Query().In("guest_id", guestIds).All(&containers) + err := GetContainerManager().Query().In("guest_id", guestIds).Asc("created_at").All(&containers) if err != nil { return nil, err }