From 2fbbe4d48035ccf37e55a74d8b4e099fa90bf878 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Thu, 6 Jun 2019 17:18:15 +0800 Subject: [PATCH] fix disk delete --- pkg/compute/tasks/disk_delete_task.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/compute/tasks/disk_delete_task.go b/pkg/compute/tasks/disk_delete_task.go index f864ed26c2..bb72273c79 100644 --- a/pkg/compute/tasks/disk_delete_task.go +++ b/pkg/compute/tasks/disk_delete_task.go @@ -71,8 +71,16 @@ func (self *DiskDeleteTask) startDeleteDisk(ctx context.Context, disk *models.SD self.OnGuestDiskDeleteComplete(ctx, disk, nil) return } - storage := disk.GetStorage() - host := storage.GetMasterHost() + var ( + storage *models.SStorage + host *models.SHost + ) + + storage = disk.GetStorage() + if storage != nil { + host = storage.GetMasterHost() + } + isPurge := false if (host == nil || !host.Enabled) && jsonutils.QueryBoolean(self.Params, "purge", false) { isPurge = true