Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/neon-autoscaler.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ spec:
guest:
rootDisk:
image: docker.io/manoharbrm/pg16-test:dev9 # TODO: update image
cpus: { min: 1, use: 1, max: 64 }
memorySlots: { min: 4, use: 16, max: 16 }
cpus: { min: 1, use: 1, limit: 64, max: 64 }
memorySlots: { min: 4, use: 4, limit: 16, max: 16 }
memorySlotSize: 128Mi
disks:
- name: data
Expand Down
9 changes: 4 additions & 5 deletions src/deployment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,12 +667,11 @@ def calculate_autoscaler_vm_cpus(milli_vcpu: int) -> dict[str, str]:
"""
Return min/use/max CPU core counts for the autoscaler VM derived from milli vCPU.
"""

vm_millis = max(1, milli_vcpu)
cpu_value = f"{vm_millis}m"
vm_millis = max(VCPU_MILLIS_MIN, milli_vcpu)
min_value = f"{VCPU_MILLIS_MIN}m"
limit_value = f"{vm_millis}m"
max_value = f"{VCPU_MILLIS_MAX}m"
return {"min": min_value, "use": cpu_value, "max": max_value}
return {"min": min_value, "use": min_value, "limit": limit_value, "max": max_value}


def calculate_autoscaler_vm_memory(memory_bytes: int) -> tuple[str, dict[str, int]]:
Expand All @@ -686,7 +685,7 @@ def calculate_autoscaler_vm_memory(memory_bytes: int) -> tuple[str, dict[str, in
target_memory_slots = min(max(desired_slots, AUTOSCALER_MEMORY_SLOTS_MIN), AUTOSCALER_MEMORY_SLOTS_MAX)
slots = {
"min": AUTOSCALER_MEMORY_SLOTS_MIN,
"use": target_memory_slots,
"use": AUTOSCALER_MEMORY_SLOTS_MIN,
"limit": target_memory_slots,
"max": AUTOSCALER_MEMORY_SLOTS_MAX,
}
Expand Down
1 change: 1 addition & 0 deletions src/deployment/charts/vela/templates/autoscaler/vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spec:
cpus:
min: {{ .Values.autoscalerVm.resources.cpus.min }}
use: {{ .Values.autoscalerVm.resources.cpus.use }}
limit: {{ .Values.autoscalerVm.resources.cpus.limit }}
max: {{ .Values.autoscalerVm.resources.cpus.max }}
memorySlots:
min: {{ .Values.autoscalerVm.resources.memorySlots.min }}
Expand Down
1 change: 1 addition & 0 deletions src/deployment/charts/vela/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ autoscalerVm:
cpus:
min: "1m"
use: "1m"
limit: "1m"
max: "64000m"
memorySlots:
min: 0
Expand Down
5 changes: 2 additions & 3 deletions src/deployment/kubernetes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,10 @@ async def resize_autoscaler_vm(
cpu_block = guest_spec.setdefault("cpus", {})
min_milli = guest.cpus.min_milli
max_milli = guest.cpus.max_milli
use_milli = cpu_milli if cpu_milli is not None else guest.cpus.use_milli
limit_milli = cpu_milli if cpu_milli is not None else guest.cpus.use_milli
cpu_block["min"] = _milli_to_cores(min_milli)
cpu_block["max"] = _milli_to_cores(max_milli)
cpu_block["use"] = _milli_to_cores(use_milli)
cpu_block["limit"] = _milli_to_cores(limit_milli)

if memory_bytes is not None:
slot_size_bytes = guest.slot_size_bytes
Expand All @@ -360,7 +360,6 @@ async def resize_autoscaler_vm(
"Requested autoscaler memory is lower than current utilization; downsizing is not permitted"
)

guest_spec.setdefault("memorySlots", {})["use"] = desired_slots
guest_spec.setdefault("memorySlots", {})["limit"] = desired_slots

return await self.apply_autoscaler_vm(namespace, name, vm_manifest)
Expand Down