From cce5ebd3f0fe9cc979491a8ded4eca6c8d0f640a Mon Sep 17 00:00:00 2001 From: Alexander Chadin Date: Tue, 6 Mar 2018 15:43:56 +0300 Subject: [PATCH] basic_consolidation trivial fix This fix adds usage of granularity parameter. Should be merged ASAP. Change-Id: I469ee056b32f95aba02100450c65945ee9877b23 --- .zuul.yaml | 7 ++++++- .../strategy/strategies/basic_consolidation.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a77e1e468..6585f142a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,12 @@ check: jobs: - watcher-tempest-multinode - - legacy-rally-dsvm-watcher-rally + - legacy-rally-dsvm-watcher-rally-non-vote + +- job: + name: legacy-rally-dsvm-watcher-rally-non-vote + parent: legacy-rally-dsvm-watcher-rally + voting: false - job: name: watcher-tempest-base-multinode diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index 10006255b..b239f856a 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -258,11 +258,11 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): def get_node_cpu_usage(self, node): resource_id = "%s_%s" % (node.uuid, node.hostname) return self.datasource_backend.get_host_cpu_usage( - resource_id, self.period, 'mean', granularity=300) + resource_id, self.period, 'mean', granularity=self.granularity) def get_instance_cpu_usage(self, instance): return self.datasource_backend.get_instance_cpu_usage( - instance.uuid, self.period, 'mean', granularity=300) + instance.uuid, self.period, 'mean', granularity=self.granularity) def calculate_score_node(self, node): """Calculate the score that represent the utilization level