starlingx
/
nfv
Code Issues Proposed changes

Merge "Add host stabilization wait for post-live-migration cleanup"

This commit is contained in:
Zuul 2020-08-27 20:30:11 +00:00 committed by Gerrit Code Review
parent 9001354b81 c4429fd67a
commit a274a40529
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nfv/nfv-vim/nfv_vim/host_fsm/_host_task_work.py
View File

@ -1825,3 +1825,35 @@ class NotifyInstancesHostDisabledTaskWork(state_machine.StateTaskWork):
self._host.uuid, self._host.name, self._callback())
return handled
class WaitHostStabilizeTaskWork(state_machine.StateTaskWork):
"""
Wait Host Stabilize Task Work
"""
def __init__(self, task, host, timeout_in_secs=60):
super(WaitHostStabilizeTaskWork, self).__init__(
'wait-host-stabilize_%s' % host.name, task,
timeout_in_secs=timeout_in_secs)
self._host_reference = weakref.ref(host)
@property
def _host(self):
"""
Returns the host
"""
host = self._host_reference()
return host
def timeout(self):
"""
Timeout is expected, so override to pass
"""
return state_machine.STATE_TASK_WORK_RESULT.SUCCESS, empty_reason
def run(self):
"""
Run wait host stabilize
"""
DLOG.verbose("Wait-Host-Stabilize for %s." % self._host.name)
return state_machine.STATE_TASK_WORK_RESULT.WAIT, empty_reason

5
nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py
View File

@ -29,6 +29,7 @@ from nfv_vim.host_fsm._host_task_work import NotifyInstancesHostDisablingTaskWor
from nfv_vim.host_fsm._host_task_work import QueryHypervisorTaskWork
from nfv_vim.host_fsm._host_task_work import WaitHostServicesCreatedTaskWork
from nfv_vim.host_fsm._host_task_work import WaitHostServicesDisabledTaskWork
from nfv_vim.host_fsm._host_task_work import WaitHostStabilizeTaskWork
DLOG = debug.debug_get_logger('nfv_vim.state_machine.host_task')
@ -235,6 +236,10 @@ class DisableHostTask(state_machine.StateTask):
task_work_list.append(NotifyHostDisabledTaskWork(
self, host, objects.HOST_SERVICES.NETWORK))
task_work_list.append(NotifyInstancesHostDisabledTaskWork(self, host))
# Wait for latent post-live-migration cleanup
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
task_work_list.append(WaitHostStabilizeTaskWork(
self, host, timeout_in_secs=10))
if host.host_service_configured(objects.HOST_SERVICES.CONTAINER):
# Only disable the container services if the host is being locked
# (or is already locked) and we are not running in a single