opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18081 from wanyaoqi/automated-cherry-pick-of-#18080-upstream-release-3.11

Browse Source 
Automated cherry pick of #18080: Fix/host delete validate
This commit is contained in:
Zexi Li
2023-09-21 22:41:26 +08:00
committed by GitHub
parent a5b782fdeb 1f4079a863
commit 6cb3a055ae
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+19 -1
View File
@@ -781,6 +781,14 @@ func (hh *SHost) validateDeleteCondition(ctx context.Context, purge bool) error
if cnt > 0 {
return httperrors.NewNotEmptyError("Not an empty host")
}
cnt, err = hh.GetBackupGuestCount()
if err != nil {
return httperrors.NewInternalServerError("GetBackupGuestCount fail %s", err)
}
if cnt > 0 {
return httperrors.NewNotEmptyError("Not an empty host")
}
for _, hoststorage := range hh.GetHoststorages() {
storage := hoststorage.GetStorage()
if storage != nil && storage.IsLocal() {
@@ -1621,6 +1629,11 @@ func (hh *SHost) GetGuestsBackupOnThisHost() []SGuest {
return guests
}
func (hh *SHost) GetBackupGuestCount() (int, error) {
q := GuestManager.Query().Equals("backup_host_id", hh.Id)
return q.CountWithError()
}
func (hh *SHost) GetGuestCount() (int, error) {
q := hh.GetGuestsQuery()
return q.CountWithError()
@@ -4270,9 +4283,14 @@ func (hh *SHost) PerformReserveCpus(
return nil, err
}
if !sets.NewInt(allCores...).HasAll(cs.ToSlice()...) {
hSets := sets.NewInt(allCores...)
cSlice := cs.ToSlice()
if !hSets.HasAll(cSlice...) {
return nil, httperrors.NewInputParameterError("Host cores not contains input %v", input.Cpus)
}
if hSets.Len() == len(cSlice) {
return nil, httperrors.NewInputParameterError("Can't reserve host all cpus")
}
if input.Mems != "" {
mems, err := cpuset.Parse(input.Mems)