Merge "Add debug logs for weigher filters"

This commit is contained in:
Zuul 2018-06-15 17:27:34 +00:00 committed by Gerrit Code Review
commit 62abbbbbe8
2 changed files with 16 additions and 3 deletions

View File

@ -19,11 +19,15 @@ Pluggable Weighing support
import abc
from oslo_log import log as logging
import six
from cinder.scheduler import base_handler
LOG = logging.getLogger(__name__)
def normalize(weight_list, minval=None, maxval=None):
"""Normalize the values in a list between 0 and 1.0.
@ -142,4 +146,10 @@ class BaseWeightHandler(base_handler.BaseHandler):
obj = weighed_objs[i]
obj.weight += weigher.weight_multiplier() * weight
LOG.debug("Weigher %(cls_name)s returned, "
"weigher value is {max: %(maxval)s, min: %(minval)s}",
{'cls_name': weigher_cls.__name__,
'maxval': weigher.maxval,
'minval': weigher.minval})
return sorted(weighed_objs, key=lambda x: x.weight, reverse=True)

View File

@ -493,9 +493,12 @@ class HostManager(object):
weigher_class_names=None):
"""Weigh the backends."""
weigher_classes = self._choose_backend_weighers(weigher_class_names)
return self.weight_handler.get_weighed_objects(weigher_classes,
backends,
weight_properties)
weighed_backends = self.weight_handler.get_weighed_objects(
weigher_classes, backends, weight_properties)
LOG.debug("Weighed %s", weighed_backends)
return weighed_backends
def update_service_capabilities(self, service_name, host, capabilities,
cluster_name, timestamp):