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

Add cpu weight config options #380

Merged
merged 4 commits into from
Feb 1, 2024
Merged

Add cpu weight config options #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c908a3e
ads cpu weight config options
dimivel Jan 25, 2024
2d99bd8
add the properties to worker, deployment_updater and clock config files
dimivel Jan 30, 2024
317950d
access properties by link
dimivel Feb 1, 2024
95ba742
adjust cc clock and worker unit tests
dimivel Feb 1, 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
2 changes: 2 additions & 0 deletions jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,6 @@ statsd_port: <%= link("cloud_controller_internal").p("cc.statsd_port") %>

max_labels_per_resource: <%= link("cloud_controller_internal").p("cc.max_labels_per_resource") %>
max_annotations_per_resource: <%= link("cloud_controller_internal").p("cc.max_annotations_per_resource") %>
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %>
2 changes: 2 additions & 0 deletions jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,6 @@ statsd_port: <%= link("cloud_controller_internal").p("cc.statsd_port") %>

max_labels_per_resource: <%= link("cloud_controller_internal").p("cc.max_labels_per_resource") %>
max_annotations_per_resource: <%= link("cloud_controller_internal").p("cc.max_annotations_per_resource") %>
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %>
8 changes: 8 additions & 0 deletions jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ provides:
- cc.buildpacks.webdav_config.private_endpoint
- cc.buildpacks.webdav_config.public_endpoint
- cc.buildpacks.webdav_config.username
- cc.cpu_weight_min_memory
- cc.cpu_weight_max_memory
- cc.credential_references.interpolate_service_bindings
- cc.custom_metric_tag_prefix_list
- cc.database_encryption.current_key_label
Expand Down Expand Up @@ -755,6 +757,12 @@ properties:
default: false
description: "Skip validations of database encryption properties"

cc.cpu_weight_min_memory:
default: 128
description: "The default minimum application instance memory used for the CPU weight calculation"
cc.cpu_weight_max_memory:
default: 8192
description: "The default maximum application instance memory used for the CPU weight calculation"
cc.default_app_memory:
default: 1024
description: "How much memory given to an app if not specified"
Expand Down
2 changes: 2 additions & 0 deletions jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ jobs:
priorities: <%= priorities.to_json %>
<% end %>

cpu_weight_min_memory: <%= p("cc.cpu_weight_min_memory") %>
philippthun marked this conversation as resolved.
Show resolved Hide resolved
cpu_weight_max_memory: <%= p("cc.cpu_weight_max_memory") %>
default_app_memory: <%= p("cc.default_app_memory") %>
default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
Expand Down
2 changes: 2 additions & 0 deletions jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,6 @@ disable_private_domain_cross_space_context_path_route_sharing: <%= link("cloud_c
max_labels_per_resource: <%= link("cloud_controller_internal").p("cc.max_labels_per_resource") %>
max_annotations_per_resource: <%= link("cloud_controller_internal").p("cc.max_annotations_per_resource") %>
custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %>
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
max_manifest_service_binding_poll_duration_in_seconds: <%= p("cc.max_manifest_service_binding_poll_duration_in_seconds") %>
2 changes: 2 additions & 0 deletions spec/cloud_controller_clock/cloud_controller_clock_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ module Test
'max_labels_per_resource' => true,
'max_annotations_per_resource' => 'yus',
'disable_private_domain_cross_space_context_path_route_sharing' => false,
'cpu_weight_min_memory' => 128,
'cpu_weight_max_memory' => 8192,
'custom_metric_tag_prefix_list' => ['heck.yes.example.com']
}
}
Expand Down
2 changes: 2 additions & 0 deletions spec/cloud_controller_worker/cloud_controller_worker_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ module Test
'max_labels_per_resource' => true,
'max_annotations_per_resource' => 'yus',
'disable_private_domain_cross_space_context_path_route_sharing' => false,
'cpu_weight_min_memory' => 128,
'cpu_weight_max_memory' => 8192,
'custom_metric_tag_prefix_list' => ['heck.yes.example.com']
}
}
Expand Down