diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 0099fe4093..1bee5bc655 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -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}, } diff --git a/pkg/compute/models/purge.go b/pkg/compute/models/purge.go index bc04910f51..442139a984 100644 --- a/pkg/compute/models/purge.go +++ b/pkg/compute/models/purge.go @@ -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)