Commit e917d66
committed
mgr/cephadm: make default command timeout field an int
When the fields was "secs" instead, we could hit
Traceback (most recent call last):
File "/usr/share/ceph/mgr/cephadm/serve.py", line 1380, in _run_cephadm_json
out, err, code = await self._run_cephadm(
File "/usr/share/ceph/mgr/cephadm/serve.py", line 1525, in _run_cephadm
raise OrchestratorError(
orchestrator._interface.OrchestratorError: cephadm exited with an error code: 2, stderr: usage: cephadm
[-h] [--image IMAGE] [--docker] [--data-dir DATA_DIR]
[--log-dir LOG_DIR] [--logrotate-dir LOGROTATE_DIR]
[--sysctl-dir SYSCTL_DIR] [--unit-dir UNIT_DIR] [--verbose]
[--timeout TIMEOUT] [--retry RETRY] [--env ENV] [--no-container-init]
[--no-cgroups-split]
{version,pull,inspect-image, . . .
...
cephadm: error: argument --timeout: invalid int value: '295.0'
where the value ends up as a floating point value
after converting to a string (which is necessary to actually
pass it to the binary). By setting the field to be an
int, we should be able to avoid this.
Signed-off-by: Adam King <[email protected]>1 parent efb69ee commit e917d66
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
475 | 475 | | |
476 | 476 | | |
477 | 477 | | |
478 | | - | |
| 478 | + | |
479 | 479 | | |
480 | 480 | | |
481 | 481 | | |
| |||
0 commit comments