From ee028422f70cd33f40af56caace99cd8eb0d754d Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Thu, 21 Feb 2019 17:23:52 +0800 Subject: [PATCH] fix create backup --- pkg/compute/models/guests.go | 5 +++++ pkg/compute/tasks/guest_backup_tasks.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 7788d4d6b1..19a5070a82 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -1400,6 +1400,11 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token } extra.Add(isGpu, "is_gpu") + if len(self.BackupHostId) > 0 { + backupHost := HostManager.FetchHostById(self.BackupHostId) + extra.Set("backup_host_name", jsonutils.NewString(backupHost.Name)) + } + if self.IsPrepaidRecycle() { extra.Add(jsonutils.JSONTrue, "is_prepaid_recycle") } else { diff --git a/pkg/compute/tasks/guest_backup_tasks.go b/pkg/compute/tasks/guest_backup_tasks.go index 6230db2d6f..481e181b9f 100644 --- a/pkg/compute/tasks/guest_backup_tasks.go +++ b/pkg/compute/tasks/guest_backup_tasks.go @@ -231,7 +231,7 @@ func (self *GuestCreateBackupTask) OnGuestStart(ctx context.Context, guest *mode self.SetStage("OnSyncToBackup", nil) err := guest.GuestStartAndSyncToBackup(ctx, self.UserCred, nil, self.GetTaskId()) if err != nil { - self.SetStageFailed(ctx, fmt.Sprintf("Guest sycn to backup error %s", err.Error())) + self.TaskFailed(ctx, guest, fmt.Sprintf("Guest sycn to backup error %s", err.Error())) } }