ctyun bugfix

This commit is contained in:
tangbin
2020-03-20 10:26:26 +08:00
parent 64698288ec
commit afcfdce7dc
10 changed files with 151 additions and 142 deletions
+8 -5
View File
@@ -3423,11 +3423,14 @@ func (self *SGuest) DeleteAllDisksInDB(ctx context.Context, userCred mcclient.To
if err != nil {
return err
}
db.OpsLog.LogEvent(disk, db.ACT_DELETE, nil, userCred)
db.OpsLog.LogEvent(disk, db.ACT_DELOCATE, nil, userCred)
err = disk.RealDelete(ctx, userCred)
if err != nil {
return err
if disk != nil {
db.OpsLog.LogEvent(disk, db.ACT_DELETE, nil, userCred)
db.OpsLog.LogEvent(disk, db.ACT_DELOCATE, nil, userCred)
err = disk.RealDelete(ctx, userCred)
if err != nil {
return err
}
}
}
return nil