修正:1. vmware同步宿主机出错后应该尽力而为地同步所有能同步的机器 2.

保存镜像时,如果缺少osType报错
This commit is contained in:
Qiu Jian
2019-01-09 00:24:33 +08:00
parent f74f91289c
commit 3745065611
2 changed files with 6 additions and 2 deletions
+5 -1
View File
@@ -104,7 +104,11 @@ func (self *SGuest) PerformSaveImage(ctx context.Context, userCred mcclient.Toke
if notes, err := data.GetString("notes"); err != nil && len(notes) > 0 {
properties.Add(jsonutils.NewString(notes), "notes")
}
properties.Add(jsonutils.NewString(self.OsType), "os_type")
osType := self.OsType
if len(osType) == 0 {
osType = "Linux"
}
properties.Add(jsonutils.NewString(osType), "os_type")
kwargs.Add(properties, "properties")
kwargs.Add(jsonutils.NewBool(restart), "restart")
@@ -36,7 +36,7 @@ func syncOnPremiseCloudProviderInfo(ctx context.Context, provider *models.SCloud
log.Infof(notes)
if result.IsError() {
logSyncFailed(provider, task, msg)
return
// return
}
db.OpsLog.LogEvent(provider, db.ACT_SYNC_HOST_COMPLETE, msg, task.UserCred)
logclient.AddActionLog(provider, getAction(task.Params), notes, task.UserCred, true)