Skip to content

Commit fbcdf57

Browse files
committed
node-proxy: address ceph orch hardware status cmd
ce360a4 introduced a regression. `ceph orch hardware status` fails when no hostname is passed (global cluster hw status report). Typical failure: ``` Error EINVAL: Traceback (most recent call last): File "/usr/share/ceph/mgr/mgr_module.py", line 1928, in _handle_command return self.handle_command(inbuf, cmd) File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 186, in handle_command return dispatch[cmd['prefix']].call(self, cmd, inbuf) File "/usr/share/ceph/mgr/mgr_module.py", line 527, in call return self.func(mgr, **kwargs) File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 122, in <lambda> wrapper_copy = lambda *l_args, **l_kwargs: wrapper(*l_args, **l_kwargs) # noqa: E731 File "/usr/share/ceph/mgr/orchestrator/_interface.py", line 111, in wrapper return func(*args, **kwargs) File "/usr/share/ceph/mgr/orchestrator/module.py", line 553, in _hardware_status row = [k, v['sn']] KeyError: 'sn' ``` Only the last node in the list has the `sn`, `host` and `firmwares` information because of the wrong identation. Fixes: https://tracker.ceph.com/issues/71472 Signed-off-by: Guillaume Abrioux <[email protected]>
1 parent 40cdb8c commit fbcdf57

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/pybind/mgr/cephadm/inventory.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,9 +1709,9 @@ def is_error(statuses: ValuesView) -> bool:
17091709
else:
17101710
state = 'ok'
17111711
_result[host]['status'][component] = state
1712-
_result[host]['sn'] = data['sn']
1713-
_result[host]['host'] = data['host']
1714-
_result[host]['status']['firmwares'] = data['firmwares']
1712+
_result[host]['sn'] = data['sn']
1713+
_result[host]['host'] = data['host']
1714+
_result[host]['status']['firmwares'] = data['firmwares']
17151715
return _result
17161716

17171717
def common(self, endpoint: str, **kw: Any) -> Dict[str, Any]:

0 commit comments

Comments
 (0)