修正:1. 删除VPC导致hostwire数据不一致问题 2. 阿里云主机无操作系统信息

3. 其他一些BUGfix
This commit is contained in:
Qiu Jian
2018-08-09 17:49:17 +08:00
parent 93be10117c
commit f0ec8a563e
20 changed files with 363 additions and 47 deletions
+4 -1
View File
@@ -5,6 +5,7 @@ import (
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"database/sql"
)
const (
@@ -37,7 +38,9 @@ func (manager *SSubTaskmanager) GetSubTask(ptaskId string, subtaskId string) *SS
subtask := SSubTask{}
err := manager.Query().Equals("task_id", ptaskId).Equals("subtask_id", subtaskId).First(&subtask)
if err != nil {
log.Errorf("GetSubTask fail %s", err)
if err != sql.ErrNoRows {
log.Errorf("GetSubTask fail %s", err)
}
return nil
}
return &subtask