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

[release-0.20] Shuffle hardware inventory for tinkerbell before reservation #8898

Merged
merged 2 commits into from
Oct 24, 2024
Merged

[release-0.20] Shuffle hardware inventory for tinkerbell before reservation #8898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4862a40
shuffle hardware inventory for tinkerbell before reservation
Jun 8, 2024
4bf3ba1
Account for mutexes during shuffle and move it to struct method
Jul 8, 2024
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
7 changes: 7 additions & 0 deletions internal/test/e2e/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ func RunTests(conf instanceRunConf, inventoryCatalogue map[string]*hardwareCatal
} else {
hardwareCatalogue = inventoryCatalogue[nonAirgappedHardware]
}
conf.Logger.Info("Shuffling hardware inventory for tinkerbell")
// shuffle hardware to introduce randomness during hardware reservation.
// we do not want quick e2e runs to always pick the first few available hardware from the list and over-populate the boot entries
// this will quickly break the booting process as the hardware runs out of boot space to store these entries.
// randomly picking the hardware will distribute the boot entries across these hardware during each run
// ideally for long term we want a clear cleanup of the boot entries in the hardware
hardwareCatalogue.shuffleHardware()
err = reserveTinkerbellHardware(&conf, hardwareCatalogue)
if err != nil {
return "", nil, err
Expand Down
10 changes: 10 additions & 0 deletions internal/test/e2e/tinkerbell_hardware_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package e2e

import (
"fmt"
"math/rand"
"sync"
"time"

Expand Down Expand Up @@ -42,6 +43,15 @@ func (hwQu *hardwareCatalogue) releaseHardware(hws []*api.Hardware) {
hwQu.mu.Unlock()
}

func (hwQu *hardwareCatalogue) shuffleHardware() {
hwQu.mu.Lock()
random := rand.New(rand.NewSource(time.Now().UnixNano()))
random.Shuffle(len(hwQu.hws), func(i, j int) {
hwQu.hws[i], hwQu.hws[j] = hwQu.hws[j], hwQu.hws[i]
})
hwQu.mu.Unlock()
}

func newHardwareCatalogue(hws []*api.Hardware) *hardwareCatalogue {
return &hardwareCatalogue{
hws: hws,
Expand Down
Loading