Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use current weighted sd as min_sd when starting to simulate migrations"

Browse Source
This commit is contained in:
Zuul
2018-01-11 08:48:43 +00:00
committed by Gerrit Code Review
parent 3754938d96 96fa7f33ac
commit 9e027940d7
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
watcher/decision_engine/strategy/strategies/workload_stabilization.py
View File

@@ -379,6 +379,16 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
migration_case.append(new_hosts) migration_case.append(new_hosts)
return migration_case return migration_case
def get_current_weighted_sd(self, hosts_load):
"""Calculate current weighted sd"""
current_sd = []
normalized_load = self.normalize_hosts_load(hosts_load)
for metric in self.metrics:
metric_sd = self.get_sd(normalized_load, metric)
current_sd.append(metric_sd)
current_sd.append(hosts_load)
return self.calculate_weighted_sd(current_sd[:-1])
def simulate_migrations(self, hosts): def simulate_migrations(self, hosts):
"""Make sorted list of pairs instance:dst_host""" """Make sorted list of pairs instance:dst_host"""
def yield_nodes(nodes): def yield_nodes(nodes):
@@ -393,14 +403,15 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
yield nodes yield nodes
instance_host_map = [] instance_host_map = []
nodes = list(self.get_available_nodes()) nodes = sorted(list(self.get_available_nodes()))
current_weighted_sd = self.get_current_weighted_sd(hosts)
for src_host in nodes: for src_host in nodes:
src_node = self.compute_model.get_node_by_uuid(src_host) src_node = self.compute_model.get_node_by_uuid(src_host)
c_nodes = copy.copy(nodes) c_nodes = copy.copy(nodes)
c_nodes.remove(src_host) c_nodes.remove(src_host)
node_list = yield_nodes(c_nodes) node_list = yield_nodes(c_nodes)
for instance in self.compute_model.get_node_instances(src_node): for instance in self.compute_model.get_node_instances(src_node):
min_sd_case = {'value': len(self.metrics)} min_sd_case = {'value': current_weighted_sd}
if instance.state not in [element.InstanceState.ACTIVE.value, if instance.state not in [element.InstanceState.ACTIVE.value,
element.InstanceState.PAUSED.value]: element.InstanceState.PAUSED.value]:
continue continue

4
watcher/tests/decision_engine/strategy/strategies/test_workload_stabilization.py
View File

@@ -228,9 +228,9 @@ class TestWorkloadStabilization(base.TestCase):
def test_simulate_migrations(self): def test_simulate_migrations(self):
model = self.fake_cluster.generate_scenario_1() model = self.fake_cluster.generate_scenario_1()
self.m_model.return_value = model self.m_model.return_value = model
self.strategy.host_choice = 'retry' self.strategy.host_choice = 'fullsearch'
self.assertEqual( self.assertEqual(
8, 10,
len(self.strategy.simulate_migrations(self.hosts_load_assert))) len(self.strategy.simulate_migrations(self.hosts_load_assert)))
def test_check_threshold(self): def test_check_threshold(self):