Merge pull request #17385 from wanyaoqi/automated-cherry-pick-of-#17384-upstream-master

Automated cherry pick of #17384: fix(region): get guestdisks count filter deleted guests
This commit is contained in:
Zexi Li
2023-07-01 00:04:16 +08:00
committed by GitHub
+2
View File
@@ -340,6 +340,8 @@ func (manager *SDiskManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field s
func (self *SDisk) GetGuestDiskCount() (int, error) {
guestdisks := GuestdiskManager.Query()
guests := GuestManager.Query().SubQuery()
guestdisks = guestdisks.Join(guests, sqlchemy.Equals(guestdisks.Field("guest_id"), guests.Field("id")))
return guestdisks.Equals("disk_id", self.Id).CountWithError()
}