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

fix: delete server will purge instance backups (#19096)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2023-12-26 15:45:08 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 5de57897c2
commit 7f2ff35da4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+2 -2
View File
@@ -2178,11 +2178,11 @@ func (self *SDisk) Delete(ctx context.Context, userCred mcclient.TokenCredential
}
func (self *SDisk) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
diskbackups := DiskBackupManager.Query("id").Equals("disk_id", self.Id)
// diskbackups := DiskBackupManager.Query("id").Equals("disk_id", self.Id)
guestdisks := GuestdiskManager.Query("row_id").Equals("disk_id", self.Id)
diskpolicies := SnapshotPolicyDiskManager.Query("row_id").Equals("disk_id", self.Id)
pairs := []purgePair{
{manager: DiskBackupManager, key: "id", q: diskbackups},
// {manager: DiskBackupManager, key: "id", q: diskbackups},
{manager: GuestdiskManager, key: "row_id", q: guestdisks},
{manager: SnapshotPolicyDiskManager, key: "row_id", q: diskpolicies},
}
pkg/compute/models/purge.go
+4 -4
View File
@@ -800,8 +800,8 @@ func (self *SGuest) purge(ctx context.Context, userCred mcclient.TokenCredential
guestvfd := GuestFloppyManager.Query("row_id").Equals("id", self.Id)
guestgroups := GroupguestManager.Query("row_id").Equals("guest_id", self.Id)
guestsecgroups := GuestsecgroupManager.Query("row_id").Equals("guest_id", self.Id)
instancesnapshots := InstanceSnapshotManager.Query("id").Equals("guest_id", self.Id)
instancebackups := InstanceBackupManager.Query("id").Equals("guest_id", self.Id)
// instancesnapshots := InstanceSnapshotManager.Query("id").Equals("guest_id", self.Id)
// instancebackups := InstanceBackupManager.Query("id").Equals("guest_id", self.Id)
publicIps := ElasticipManager.Query("id").Equals("mode", api.EIP_MODE_INSTANCE_PUBLICIP).
Equals("associate_type", api.EIP_ASSOCIATE_TYPE_SERVER).Equals("associate_id", self.Id)
tapService := NetTapServiceManager.Query("id").Equals("type", api.TapServiceGuest).Equals("target_id", self.Id)
@@ -821,8 +821,8 @@ func (self *SGuest) purge(ctx context.Context, userCred mcclient.TokenCredential
{manager: GuestFloppyManager, key: "row_id", q: guestvfd},
{manager: GuestnetworkManager, key: "row_id", q: guestnetworks},
{manager: GuestdiskManager, key: "row_id", q: guestdisks},
{manager: InstanceSnapshotManager, key: "id", q: instancesnapshots},
{manager: InstanceBackupManager, key: "id", q: instancebackups},
// {manager: InstanceSnapshotManager, key: "id", q: instancesnapshots},
// {manager: InstanceBackupManager, key: "id", q: instancebackups},
}
for i := range pairs {
err := pairs[i].purgeAll(ctx)