Merge "Show proper error when there are not enough compute nodes"
This commit is contained in:
commit
0609e02559
|
@ -66,9 +66,14 @@ def generate_agents(compute_nodes, accommodation, unique):
|
|||
# sort nodes to interleave hosts from different zones
|
||||
compute_nodes = prepare_for_cross_az(compute_nodes, zones)
|
||||
|
||||
if accommodation.get('compute_nodes'):
|
||||
compute_nodes = random.sample(
|
||||
compute_nodes, accommodation.get('compute_nodes'))
|
||||
compute_nodes_requested = accommodation.get('compute_nodes')
|
||||
if compute_nodes_requested:
|
||||
if compute_nodes_requested > len(compute_nodes):
|
||||
raise DeploymentException(
|
||||
'Not enough compute nodes %(cn)s for requested '
|
||||
'instance accommodation %(acc)s' %
|
||||
dict(cn=compute_nodes, acc=accommodation))
|
||||
compute_nodes = random.sample(compute_nodes, compute_nodes_requested)
|
||||
|
||||
cn_count = len(compute_nodes)
|
||||
iterations = cn_count * density
|
||||
|
|
|
@ -205,7 +205,7 @@ def play_scenario(message_queue, scenario):
|
|||
record = dict(id=utils.make_record_id(), status='interrupted')
|
||||
else:
|
||||
error_msg = 'Error while executing scenario: %s' % e
|
||||
LOG.error(error_msg, exc_info=True)
|
||||
LOG.exception(e)
|
||||
record = dict(id=utils.make_record_id(), status='error',
|
||||
stderr=error_msg)
|
||||
output['records'][record['id']] = record
|
||||
|
|
|
@ -83,6 +83,13 @@ class TestDeploy(testtools.TestCase):
|
|||
self.assertRaises(deploy.DeploymentException, deploy.generate_agents,
|
||||
['uno'], accommodation, unique)
|
||||
|
||||
def test_generate_agents_pair_single_room_compute_nodes_not_enough(self):
|
||||
unique = 'UU1D'
|
||||
accommodation = deploy.normalize_accommodation(
|
||||
['pair', 'single_room', {'compute_nodes': 2}])
|
||||
self.assertRaises(deploy.DeploymentException, deploy.generate_agents,
|
||||
['uno'], accommodation, unique)
|
||||
|
||||
def test_generate_agents_pair_double_room(self):
|
||||
unique = 'UU1D'
|
||||
expected = {
|
||||
|
|
Loading…
Reference in New Issue