diff --git a/pkg/compute/tasks/guest_detach_scalinggroup.go b/pkg/compute/tasks/guest_detach_scalinggroup.go index 1c75dbd298..d988552d93 100644 --- a/pkg/compute/tasks/guest_detach_scalinggroup.go +++ b/pkg/compute/tasks/guest_detach_scalinggroup.go @@ -118,7 +118,7 @@ func (self *GuestDetachScalingGroupTask) OnDeleteGuestComplete(ctx context.Conte } logclient.AddActionLogWithStartable(self, sg, logclient.ACT_REMOVE_GUEST, fmt.Sprintf("Instance '%s' was removed", guestId), self.UserCred, true) - if auto, err := self.Params.Bool("auto"); err == nil || !auto { + if auto, _ := self.Params.Bool("auto"); !auto { // scale; change the desire number err := sg.Scale(ctx, SScalingTriggerDesc{guestName}, SScalingActionDesc{}) if err != nil { diff --git a/pkg/controller/autoscaling/health_check.go b/pkg/controller/autoscaling/health_check.go index 2d5f100857..f3ea250167 100644 --- a/pkg/controller/autoscaling/health_check.go +++ b/pkg/controller/autoscaling/health_check.go @@ -44,7 +44,7 @@ func (asc *SASController) CheckInstanceHealth(ctx context.Context, userCred mccl checkEarliestTime := time.Now().Add(-10 * time.Minute) // Fetch all unhealth status instace unnormalGuests := make([]sUnnormalGuest, 0, 5) - sgQ := models.ScalingGroupManager.Query("id").IsFalse("enabled").SubQuery() + sgQ := models.ScalingGroupManager.Query("id").IsTrue("enabled").SubQuery() sggQ := models.ScalingGroupGuestManager.Query("guest_id", "scaling_group_id").In("scaling_group_id", sgQ).SubQuery() q := models.GuestManager.Query("id", "status").In("status", UnhealthStatus).LT("created_at", checkEarliestTime) q = q.Join(sggQ, sqlchemy.Equals(q.Field("id"), sggQ.Field("guest_id"))) @@ -55,7 +55,7 @@ func (asc *SASController) CheckInstanceHealth(ctx context.Context, userCred mccl } for rows.Next() { var ug sUnnormalGuest - rows.Scan(&ug) + rows.Scan(&ug.Id, &ug.Status, &ug.ScalngGroupId) unnormalGuests = append(unnormalGuests, ug) } rows.Close() @@ -83,7 +83,7 @@ func (asc *SASController) CheckInstanceHealth(ctx context.Context, userCred mccl if len(readyGuestList) > 0 { go func() { - time.Sleep(3 * time.Minute) + time.Sleep(2 * time.Minute) q := models.GuestManager.Query("id").In("id", readyGuestList).Equals("status", apis.VM_READY) rows, err := q.Rows() if err != nil {