Skip to content

Update Autoscaler Warmup deployment path #607

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

Merged
sumanthreddy29 merged 1 commit into from
Apr 29, 2025
Merged

Update Autoscaler Warmup deployment path #607

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
21 changes: 11 additions & 10 deletions modules/python/clusterloader2/autoscale/autoscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
from clusterloader2.utils import parse_xml_to_json, run_cl2_command
from clients.kubernetes_client import KubernetesClient

def warmup_deployment_for_karpeneter():
def warmup_deployment_for_karpeneter(cl2_config_dir):
print("WarmUp Deployment Started")
deployment_file = "autoscale/config/warmup_deployment.yaml"
deployment_file = f"{cl2_config_dir}/warmup_deployment.yaml"
subprocess.run(["kubectl", "apply", "-f", deployment_file], check=True)

def cleanup_warmup_deployment_for_karpeneter():
deployment_file = "autoscale/config/warmup_deployment.yaml"
def cleanup_warmup_deployment_for_karpeneter(cl2_config_dir):
deployment_file = f"{cl2_config_dir}/warmup_deployment.yaml"
subprocess.run(["kubectl", "delete", "-f", deployment_file], check=True)
print("WarmUp Deployment Deleted")
try:
Expand All @@ -33,7 +33,7 @@ def _get_daemonsets_pods_allocated_resources(client, node_name):
cpu_request += int(container.resources.requests.get("cpu", "0m").replace("m", ""))
return cpu_request

def calculate_cpu_request_for_clusterloader2(node_label_selector, node_count, pod_count, warmup_deployment):
def calculate_cpu_request_for_clusterloader2(node_label_selector, node_count, pod_count, warmup_deployment, cl2_config_dir):
client = KubernetesClient(os.path.expanduser("~/.kube/config"))
timeout = 600 # 10 minutes
interval = 30 # 30 seconds
Expand Down Expand Up @@ -67,21 +67,21 @@ def calculate_cpu_request_for_clusterloader2(node_label_selector, node_count, po
# Remove warmup deployment cpu request from the total cpu value
if warmup_deployment in ["true", "True"]:
cpu_value -= 100
cleanup_warmup_deployment_for_karpeneter()
cleanup_warmup_deployment_for_karpeneter(cl2_config_dir)

# Calculate the cpu request for each pod
pods_per_node = pod_count // node_count
cpu_request = cpu_value // pods_per_node
return cpu_request

def override_config_clusterloader2(cpu_per_node, node_count, pod_count, scale_up_timeout, scale_down_timeout, loop_count, node_label_selector, node_selector, override_file, warmup_deployment):
def override_config_clusterloader2(cpu_per_node, node_count, pod_count, scale_up_timeout, scale_down_timeout, loop_count, node_label_selector, node_selector, override_file, warmup_deployment, cl2_config_dir):
print(f"CPU per node: {cpu_per_node}")
desired_node_count = 1
if warmup_deployment in ["true", "True"]:
warmup_deployment_for_karpeneter()
warmup_deployment_for_karpeneter(cl2_config_dir)
desired_node_count = 0

cpu_request = calculate_cpu_request_for_clusterloader2(node_label_selector, node_count, pod_count, warmup_deployment)
cpu_request = calculate_cpu_request_for_clusterloader2(node_label_selector, node_count, pod_count, warmup_deployment, cl2_config_dir)

print(f"Total number of nodes: {node_count}, total number of pods: {pod_count}")
print(f"CPU request for each pod: {cpu_request}m")
Expand Down Expand Up @@ -210,6 +210,7 @@ def main():
parser_override.add_argument("node_selector", type=str, help="Node selector for the test pods")
parser_override.add_argument("cl2_override_file", type=str, help="Path to the overrides of CL2 config file")
parser_override.add_argument("warmup_deployment", type=str, help="Warmup deployment to get the cpu request")
parser_override.add_argument("cl2_config_dir", type=str, help="Path to the CL2 config directory")

# Sub-command for execute_clusterloader2
parser_execute = subparsers.add_parser("execute", help="Execute scale up operation")
Expand All @@ -234,7 +235,7 @@ def main():
args = parser.parse_args()

if args.command == "override":
override_config_clusterloader2(args.cpu_per_node, args.node_count, args.pod_count, args.scale_up_timeout, args.scale_down_timeout, args.loop_count, args.node_label_selector, args.node_selector, args.cl2_override_file, args.warmup_deployment)
override_config_clusterloader2(args.cpu_per_node, args.node_count, args.pod_count, args.scale_up_timeout, args.scale_down_timeout, args.loop_count, args.node_label_selector, args.node_selector, args.cl2_override_file, args.warmup_deployment, args.cl2_config_dir)
elif args.command == "execute":
execute_clusterloader2(args.cl2_image, args.cl2_config_dir, args.cl2_report_dir, args.kubeconfig, args.provider)
elif args.command == "collect":
Expand Down
2 changes: 1 addition & 1 deletion steps/engine/clusterloader2/autoscale/execute.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
PYTHONPATH=$PYTHONPATH:$(pwd) python3 $PYTHON_SCRIPT_FILE override \
$CPU_PER_NODE $NODE_COUNT $POD_COUNT \
$SCALE_UP_TIMEOUT $SCALE_DOWN_TIMEOUT \
$LOOP_COUNT "$NODE_LABEL_SELECTOR" "$NODE_SELECTOR" ${CL2_CONFIG_DIR}/overrides.yaml ${WARMUP_DEPLOYMENT:-false}
$LOOP_COUNT "$NODE_LABEL_SELECTOR" "$NODE_SELECTOR" ${CL2_CONFIG_DIR}/overrides.yaml ${WARMUP_DEPLOYMENT:-false} ${CL2_CONFIG_DIR}
PYTHONPATH=$PYTHONPATH:$(pwd) python3 $PYTHON_SCRIPT_FILE execute \
${CL2_IMAGE} ${CL2_CONFIG_DIR} $CL2_REPORT_DIR ${HOME}/.kube/config $CLOUD
workingDirectory: modules/python
Expand Down