Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix VMSet scaledown bug #184

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Fix VMSet scaledown bug #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions v3/pkg/controllers/vmsetcontroller/vmsetcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package vmsetcontroller
import (
"context"
"fmt"
"math/rand"
"strings"
"time"

hfv1 "github.com/hobbyfarm/gargantua/v3/pkg/apis/hobbyfarm.io/v1"
hfClientset "github.com/hobbyfarm/gargantua/v3/pkg/client/clientset/versioned"
hfInformers "github.com/hobbyfarm/gargantua/v3/pkg/client/informers/externalversions"
"github.com/hobbyfarm/gargantua/v3/pkg/client/listers/hobbyfarm.io/v1"
v1 "github.com/hobbyfarm/gargantua/v3/pkg/client/listers/hobbyfarm.io/v1"
util2 "github.com/hobbyfarm/gargantua/v3/pkg/util"
"math/rand"
"strings"
"time"

"github.com/golang/glog"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -357,20 +358,35 @@ func (v *VirtualMachineSetController) reconcileVirtualMachineSet(vmset *hfv1.Vir
}
}
}
//-----------------------handle case of scaling down VMSets

// handle case of scaling down VMSets
if len(currentVMs) > vmset.Spec.Count {
needed_delete := len(currentVMs) - vmset.Spec.Count
// We first calculate how many VMs already have been deleted to avoid deleting more than we need
currentlyDeleting := 0
for _, x := range currentVMs {
if x.DeletionTimestamp != nil {
currentlyDeleting++
}
}

// We need to delete all over the spec.count minus the VMs that are already being deleted right now.
needed_delete := len(currentVMs) - vmset.Spec.Count - currentlyDeleting
glog.V(4).Infof("vmset %s needs to delete %d vm's and %d are already flagged as deleted", vmset.Name, needed_delete, currentlyDeleting)
for _, cur_vm := range currentVMs {
if !cur_vm.Status.Allocated {
if needed_delete == 0 {
break
}

if !cur_vm.Status.Allocated && cur_vm.DeletionTimestamp == nil {
v.hfClientSet.HobbyfarmV1().VirtualMachines(util2.GetReleaseNamespace()).Delete(v.ctx, cur_vm.Name, metav1.DeleteOptions{})
needed_delete--
if needed_delete == 0 {
break
}
}
}
if needed_delete > 0 {
glog.V(4).Infof("vmset %d could not delete %d VMs due to some VMs being in use.", vmset.Name, needed_delete)
}
}
//-----------------------------------------------------

vms, err := v.vmLister.List(labels.Set{
"vmset": string(vmset.Name),
}.AsSelector())
Expand Down
Loading