mgr/cephadm: fix call to cephadm for daemon restarts etc#36338
Merged
sebastian-philipp merged 2 commits intoceph:masterfrom Jul 31, 2020
pcuzner:fix-daemon-actions
Merged
mgr/cephadm: fix call to cephadm for daemon restarts etc#36338sebastian-philipp merged 2 commits intoceph:masterfrom pcuzner:fix-daemon-actions
sebastian-philipp merged 2 commits intoceph:masterfrom
pcuzner:fix-daemon-actions
Conversation
The call currently passes the daemon_type as the first parameter - but the function expects the hostname. This results in failures when attempting daemon restarts through the ceph orch daemon <action> <daemon_id> command. Fixes: https://tracker.ceph.com/issues/46740 Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
jmolmo
approved these changes
Jul 29, 2020
Contributor
|
mind adding a test for this? diff --git a/qa/tasks/cephadm_cases/test_cli.py b/qa/tasks/cephadm_cases/test_cli.py
index 3d39902a09..97f97bcfc9 100644
--- a/qa/tasks/cephadm_cases/test_cli.py
+++ b/qa/tasks/cephadm_cases/test_cli.py
@@ -43,3 +43,6 @@ class TestCephadmCLI(MgrTestCase):
self.wait_for_health('CEPHADM_PAUSED', 30)
self._orch_cmd('resume')
self.wait_for_health_clear(30)
+
+ def test_daemon_restart(self):
+ self._orch_cmd('daemon', 'restart', 'osd.0')I don't want to run into this again. |
varshar16
approved these changes
Jul 29, 2020
Contributor
varshar16
left a comment
There was a problem hiding this comment.
Tested locally, it resolves the issue.
Added tests to cove daemon stop/start and restart Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
Contributor
Author
|
added test covering stop/start and restart |
mgfritch
approved these changes
Jul 29, 2020
Contributor
mgfritch
left a comment
There was a problem hiding this comment.
confirm this fixes both a service restart:
$ ceph orch <service_name>
and also a per daemon restart:
$ ceph orch daemon restart <daemon_name>
Contributor
|
|
varshar16
added a commit
to ceph/ceph-ci
that referenced
this pull request
Jul 31, 2020
Signed-off-by: Varsha Rao <varao@redhat.com>
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The call currently passes the daemon_type as the first
parameter - but the function expects the hostname. This
results in failures when attempting daemon restarts through
the ceph orch daemon <daemon_id> command.
Fixes: https://tracker.ceph.com/issues/46740
Signed-off-by: Paul Cuzner pcuzner@redhat.com