Skip to content

Improve logging in cpuallocator #5677

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

Open
zedi-pramodh wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Improve logging in cpuallocator #5677

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions pkg/pillar/cmd/domainmgr/domainmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ func assignCPUs(ctx *domainContext, config *types.DomainConfig, status *types.Do
if config.VmConfig.CPUsPinned { // Pin the CPU
cpusToAssign, err := ctx.cpuAllocator.Allocate(config.UUIDandVersion.UUID, config.VCpus)
if err != nil {
return errors.New("failed to allocate necessary amount of CPUs")
return err
}
for _, cpu := range cpusToAssign {
status.VmConfig.CPUs = append(status.VmConfig.CPUs, cpu)
Expand Down Expand Up @@ -1680,7 +1680,7 @@ func doActivate(ctx *domainContext, config types.DomainConfig,

if ctx.cpuPinningSupported {
if err := assignCPUs(ctx, &config, status); err != nil {
log.Warnf("failed to assign CPUs for %s", config.DisplayName)
log.Warnf("failed to assign CPUs for %s err %v", config.DisplayName, err)
errDescription := types.ErrorDescription{Error: err.Error()}
status.SetErrorDescription(errDescription)
publishDomainStatus(ctx, status)
Expand Down
4 changes: 2 additions & 2 deletions pkg/pillar/cpuallocator/cpuallocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ func (cpuAllocator *CPUAllocator) getFree(numCPUsRequested int) ([]uint32, error
}
}
if found < numCPUsRequested {
return []uint32{}, fmt.Errorf("looking for %d CPUs only found %d",
numCPUsRequested, found)
return []uint32{}, fmt.Errorf("looking for %d CPUs only found %d reserved for EVE %d total %d",
numCPUsRequested, found, cpuAllocator.numReservedForEVE, cpuAllocator.totalCPUs)
}
return result, nil
}
Expand Down
Loading