Merge pull request #6786 from rainzm/fix/syncclouddisks

fix: Hanle the error of vdisk.GetIStorage in syncCloudDisk
This commit is contained in:
Zexi Li
2020-06-10 11:27:36 +08:00
committed by GitHub
+4 -1
View File
@@ -1218,7 +1218,10 @@ func (manager *SDiskManager) syncCloudDisk(ctx context.Context, userCred mcclien
diskObj, err := db.FetchByExternalId(manager, vdisk.GetGlobalId())
if err != nil {
if err == sql.ErrNoRows {
vstorage, _ := vdisk.GetIStorage()
vstorage, err := vdisk.GetIStorage()
if err != nil {
return nil, errors.Wrapf(err, "unable to GetIStorage of vdisk %q", vdisk.GetName())
}
storageObj, err := db.FetchByExternalId(StorageManager, vstorage.GetGlobalId())
if err != nil {