diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-12-06 09:09:16 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-12-06 09:09:16 +0100 |
| commit | 3e225d2cd65a7ebb2b469b576b1920cd1f115c42 (patch) | |
| tree | 5134c905fbdc1ef573c4a7da1033cd8e5b4de674 | |
| parent | e51c6b930e1e0c64de8f233417a686a24d24de49 (diff) | |
| download | ironic-3e225d2cd65a7ebb2b469b576b1920cd1f115c42.tar.gz | |
Trivial: log current state when continuing cleaning
Change-Id: I02a8ed6802fffee071e94be3c0cab2382b7e60ca
| -rw-r--r-- | ironic/conductor/cleaning.py | 4 | ||||
| -rw-r--r-- | ironic/drivers/modules/agent_base.py | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ironic/conductor/cleaning.py b/ironic/conductor/cleaning.py index 1ea35bfcf..752f07e6a 100644 --- a/ironic/conductor/cleaning.py +++ b/ironic/conductor/cleaning.py @@ -154,9 +154,9 @@ def do_next_clean_step(task, step_index, disable_ramdisk=None): disable_ramdisk = node.driver_internal_info.get( 'cleaning_disable_ramdisk', False) - LOG.info('Executing %(state)s on node %(node)s, remaining steps: ' + LOG.info('Executing %(kind)s cleaning on node %(node)s, remaining steps: ' '%(steps)s', {'node': node.uuid, 'steps': steps, - 'state': node.provision_state}) + 'kind': 'manual' if manual_clean else 'automated'}) # Execute each step until we hit an async step or run out of steps for ind, step in enumerate(steps): diff --git a/ironic/drivers/modules/agent_base.py b/ironic/drivers/modules/agent_base.py index 51d96ec4d..321c05b85 100644 --- a/ironic/drivers/modules/agent_base.py +++ b/ironic/drivers/modules/agent_base.py @@ -507,8 +507,11 @@ class HeartbeatMixin(object): try: node.touch_provisioning() if not node.clean_step: - LOG.debug('Node %s just booted to start cleaning.', - node.uuid) + kind = ('manual' + if node.target_provision_state == states.MANAGEABLE + else 'automated') + LOG.debug('Node %s just booted to start %s cleaning', + node.uuid, kind) msg = _('Node failed to start the first cleaning step') # First, cache the clean steps self.refresh_clean_steps(task) @@ -577,7 +580,8 @@ class HeartbeatMixin(object): return node = task.node - LOG.debug('Heartbeat from node %s', node.uuid) + LOG.debug('Heartbeat from node %s in state %s (target state %s)', + node.uuid, node.provision_state, node.target_provision_state) driver_internal_info = node.driver_internal_info driver_internal_info['agent_url'] = callback_url driver_internal_info['agent_version'] = agent_version |