From db5363d617193dfaf04a4a72e7684a8a34460773 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 20 Sep 2023 14:45:58 +0800 Subject: [PATCH] fix(region,host): guest save image restart not work --- pkg/compute/tasks/disk_save_task.go | 4 ++++ pkg/hostman/storageman/diskhandlers/diskhandler.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/compute/tasks/disk_save_task.go b/pkg/compute/tasks/disk_save_task.go index b9823cba8d..8b9a755b0e 100644 --- a/pkg/compute/tasks/disk_save_task.go +++ b/pkg/compute/tasks/disk_save_task.go @@ -110,6 +110,10 @@ func (self *DiskSaveTask) OnDiskBackupComplete(ctx context.Context, disk *models if err != nil { self.taskFailed(ctx, disk, errors.Wrapf(err, "UploadDisk")) return + } else { + // notify guest save image task to resume guest + // disk save task waiting for image uploaded to refresh imagecache + self.NotifyParentTaskComplete(ctx, jsonutils.NewDict(), false) } } diff --git a/pkg/hostman/storageman/diskhandlers/diskhandler.go b/pkg/hostman/storageman/diskhandlers/diskhandler.go index bc1a0533e8..fdba8dabbd 100644 --- a/pkg/hostman/storageman/diskhandlers/diskhandler.go +++ b/pkg/hostman/storageman/diskhandlers/diskhandler.go @@ -209,7 +209,7 @@ func saveToGlance(ctx context.Context, w http.ResponseWriter, r *http.Request) { DiskInfo: diskInfo.(*jsonutils.JSONDict), } - hostutils.DelayTaskWithoutReqctx(ctx, storage.SaveToGlance, info) + hostutils.DelayTask(ctx, storage.SaveToGlance, info) hostutils.ResponseOk(ctx, w) }