public_git
/
orchard
mirror of https://github.com/cirruslabs/orchard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Worker: prefer assigned CPU/memory to CPU/memory (#250) 

* Worker: prefer assigned CPU/memory to CPU/memory

* orchard get worker: show default CPU, default memory and labels
This commit is contained in:
Nikolay Edigaryev 2025-02-13 16:23:47 +04:00 committed by GitHub
parent ee3c0f91f2
commit 2aae818f78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/command/get/worker.go
View File

@ -69,16 +69,19 @@ func runGetWorker(cmd *cobra.Command, args []string) error {
table.AddRow("Machine ID", worker.MachineID)
table.AddRow("Scheduling paused", worker.SchedulingPaused)
table.AddRow("Default CPU", worker.DefaultCPU)
table.AddRow("Default memory", worker.DefaultCPU)
var resourcesInfo string
if len(worker.Resources) != 0 {
resourceDescriptions := lo.MapToSlice(worker.Resources, func(key string, value uint64) string {
return fmt.Sprintf("%s: %d", key, value)
})
resourcesInfo = strings.Join(resourceDescriptions, "\n")
}
resourcesInfo := strings.Join(lo.MapToSlice(worker.Resources, func(key string, value uint64) string {
return fmt.Sprintf("%s: %d", key, value)
}), "\n")
table.AddRow("Resources", nonEmptyOrNone(resourcesInfo))
labelsInfo := strings.Join(lo.MapToSlice(worker.Labels, func(key string, value string) string {
return fmt.Sprintf("%s: %s", key, value)
}), "\n")
table.AddRow("Labels", nonEmptyOrNone(labelsInfo))
fmt.Println(table)
return nil

22
internal/worker/vmmanager/vm.go
View File

@ -195,17 +195,31 @@ func (vm *VM) cloneAndConfigure(ctx context.Context) error {
vm.imageFQN.Store(&fqn)
}
if vm.Resource.Memory != 0 {
// Set memory
memory := vm.Resource.AssignedMemory
if memory == 0 {
memory = vm.Resource.Memory
}
if memory != 0 {
_, _, err = tart.Tart(ctx, vm.logger, "set", "--memory",
strconv.FormatUint(vm.Resource.Memory, 10), vm.id())
strconv.FormatUint(memory, 10), vm.id())
if err != nil {
return err
}
}
if vm.Resource.CPU != 0 {
// Set CPU
cpu := vm.Resource.AssignedCPU
if cpu == 0 {
cpu = vm.Resource.CPU
}
if cpu != 0 {
_, _, err = tart.Tart(ctx, vm.logger, "set", "--cpu",
strconv.FormatUint(vm.Resource.CPU, 10), vm.id())
strconv.FormatUint(cpu, 10), vm.id())
if err != nil {
return err
}