Fix for timeouts on scale down

There were two issues: The action timeout and the wait_for_messages
timeout.

The wait_for_messages did not need a timeout here and it was causing the
bug. I added an cli option for the timeout and setup a reasonable
default (the previous default was over 4 hours that would invalidate
keystone session duration)

Change-Id: I232d071516d3f53f9f87143d9d65ebe3e58b0f38
Closes-Bug: 1734712
changes/63/522863/2
Adriano Petrich 5 years ago committed by Ryan Brady
parent 2ae6670274
commit 715324adf9
  1. 1
      tripleoclient/constants.py
  2. 11
      tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
  3. 14
      tripleoclient/v1/overcloud_node.py
  4. 3
      tripleoclient/workflows/scale.py

@ -49,3 +49,4 @@ PUPPET_MODULES = "/etc/puppet/modules/"
PUPPET_BASE = "/etc/puppet/"
# Update Queue
UPDATE_QUEUE = 'update'
STACK_TIMEOUT = 240

@ -51,7 +51,7 @@ class TestDeleteNode(fakes.TestDeleteNode):
# probably be fixed so that it can pass with that.
def test_node_delete(self):
argslist = ['instance1', 'instance2', '--templates',
'--stack', 'overcast']
'--stack', 'overcast', '--timeout', '90']
verifylist = [
('stack', 'overcast'),
('nodes', ['instance1', 'instance2'])
@ -72,7 +72,8 @@ class TestDeleteNode(fakes.TestDeleteNode):
'tripleo.scale.v1.delete_node',
workflow_input={
'container': 'overcast',
'nodes': ['instance1', 'instance2']
'nodes': ['instance1', 'instance2'],
'timeout': 90
})
def test_node_wrong_stack(self):
@ -115,7 +116,8 @@ class TestDeleteNode(fakes.TestDeleteNode):
'tripleo.scale.v1.delete_node',
workflow_input={
'container': 'overcloud',
'nodes': ['instance1', ]
'nodes': ['instance1', ],
'timeout': 240
})
def test_node_delete_wrong_instance(self):
@ -142,7 +144,8 @@ class TestDeleteNode(fakes.TestDeleteNode):
'tripleo.scale.v1.delete_node',
workflow_input={
'container': 'overcloud',
'nodes': ['wrong_instance', ]
'nodes': ['wrong_instance', ],
'timeout': 240
})

@ -60,6 +60,13 @@ class DeleteNode(command.Command):
"Otherwise this argument will be silently ignored."),
)
parser.add_argument(
'--timeout', metavar='<TIMEOUT>',
type=int, default=constants.STACK_TIMEOUT, dest='timeout',
help=_("Timeout in minutes to wait for the nodes to be deleted. "
"Keep in mind that due to keystone session duration "
"that timeout has an upper bound of 4 hours ")
)
return parser
def take_action(self, parsed_args):
@ -77,7 +84,12 @@ class DeleteNode(command.Command):
print("Deleting the following nodes from stack {stack}:\n{nodes}"
.format(stack=stack.stack_name, nodes=nodes))
scale.scale_down(clients, stack.stack_name, parsed_args.nodes)
scale.scale_down(
clients,
stack.stack_name,
parsed_args.nodes,
parsed_args.timeout
)
class ProvideNode(command.Command):

@ -30,8 +30,7 @@ def delete_node(clients, **workflow_input):
workflow_input=workflow_input
)
for payload in base.wait_for_messages(workflow_client, ws, execution,
360):
for payload in base.wait_for_messages(workflow_client, ws, execution):
if payload['status'] != "SUCCESS":
raise InvalidConfiguration(payload['message'])

Loading…
Cancel
Save