Skip to content

Synchronise wallaby with upstream #49

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
merged 2 commits into from
Jul 17, 2023
Merged

Synchronise wallaby with upstream #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf8e816
Add debug log for scheduler weight calculation
Nov 11, 2021
57c084f
Merge "Add debug log for scheduler weight calculation" into stable/wa…
Jul 12, 2023
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
40 changes: 36 additions & 4 deletions nova/weights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@

import abc

from oslo_log import log as logging

from nova import loadables


LOG = logging.getLogger(__name__)


def normalize(weight_list, minval=None, maxval=None):
"""Normalize the values in a list between 0 and 1.0.

Expand Down Expand Up @@ -127,13 +132,40 @@ def get_weighed_objects(self, weighers, obj_list, weighing_properties):
for weigher in weighers:
weights = weigher.weigh_objects(weighed_objs, weighing_properties)

LOG.debug(
"%s: raw weights %s",
weigher.__class__.__name__,
{(obj.obj.host, obj.obj.nodename): weight
for obj, weight in zip(weighed_objs, weights)}
)

# Normalize the weights
weights = normalize(weights,
minval=weigher.minval,
maxval=weigher.maxval)
weights = list(
normalize(
weights, minval=weigher.minval, maxval=weigher.maxval))

LOG.debug(
"%s: normalized weights %s",
weigher.__class__.__name__,
{(obj.obj.host, obj.obj.nodename): weight
for obj, weight in zip(weighed_objs, weights)}
)

log_data = {}

for i, weight in enumerate(weights):
obj = weighed_objs[i]
obj.weight += weigher.weight_multiplier(obj.obj) * weight
multiplier = weigher.weight_multiplier(obj.obj)
weigher_score = multiplier * weight
obj.weight += weigher_score

log_data[(obj.obj.host, obj.obj.nodename)] = (
f"{multiplier} * {weight}")

LOG.debug(
"%s: score (multiplier * weight) %s",
weigher.__class__.__name__,
{name: log for name, log in log_data.items()}
)

return sorted(weighed_objs, key=lambda x: x.weight, reverse=True)