Merge pull request #5143 from wanyaoqi/bugfix/wyq/misc-fix-200217

misc bugfix: check scsi driver on add disk

pkg/compute/models/guest_actions.go

@@ -2124,6 +2124,7 @@ func (self *SGuest) PerformAttachnetwork(ctx context.Context, userCred mcclient.
 	defer host.ClearSchedDescCache()
 	for i := 0; i < count; i++ {
 		_, err = self.attach2NetworkDesc(ctx, userCred, host, input.Nets[i], pendingUsage, nil)
+		logclient.AddSimpleActionLog(self, logclient.ACT_ATTACH_NETWORK, input.Nets[i], userCred, err == nil)
 		if err != nil {
 			quotas.CancelPendingUsage(ctx, userCred, pendingUsage, pendingUsage)
 			return nil, httperrors.NewBadRequestError(err.Error())

pkg/compute/tasks/ha_guest_deploy_task.go

@@ -29,6 +29,7 @@ func (self *HAGuestDeployTask) OnDeployGuestComplete(
 }
 
 func (self *HAGuestDeployTask) DeployBackup(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
+	self.SetStage("OnDeploySlaveGuestComplete", nil)
 	host := models.HostManager.FetchHostById(guest.BackupHostId)
 	err := guest.GetDriver().RequestDeployGuestOnHost(ctx, guest, host, self)
 	if err != nil {