mgr: fix python module teardown & add tests #14232
Conversation
|
will review this PR tomorrow. |
| @@ -686,9 +683,6 @@ def __init__(self, ctx): | |||
| super(LocalMgrCluster, self).__init__(ctx) | |||
|
|
|||
| self.mgr_ids = ctx.daemons.daemons['mgr'].keys() | |||
| if not self.mgr_ids: | |||
| raise RuntimeError("No manager daemonss found in ceph.conf!") | |||
There was a problem hiding this comment.
This line was being removed anyway
qa/tasks/vstart_runner.py
Outdated
|
|
||
| for suite, case in enumerate_methods(overall_suite): | ||
| max_required_mds = max(max_required_mds, | ||
| getattr(case, "MDSS_REQUIRED", 0)) | ||
| max_required_clients = max(max_required_clients, | ||
| getattr(case, "CLIENTS_REQUIRED", 0)) | ||
| max_required_mgr = max(max_required_mgr, | ||
| getattr(case, "REQUIRE_MGRS", 0)) |
There was a problem hiding this comment.
can we use "MGRS_REQUIRED" for the sake of consistency?
| @@ -906,7 +903,7 @@ def exec_test(): | |||
| vstart_env["FS"] = "0" | |||
| vstart_env["MDS"] = max_required_mds.__str__() | |||
| vstart_env["OSD"] = "1" | |||
| vstart_env["MGR"] = "1" | |||
| vstart_env["MGR"] = max(max_required_mgr, 1).__str__() | |||
There was a problem hiding this comment.
just out of curiosity, why don't use
str(max(max_required_mgr, 1))There was a problem hiding this comment.
No reason, they're completely equivalent afaik
|
@jcsp lgtm modulo some nits. |
|
@jcsp pls rebase remote: Counting objects: 21, done.
|
|
those might be conflicts with #14507 btw |
|
Pushed an update (this did not need rebase, as sage says it is just conflicting with the other outstanding PR) |
|
Will try to rebuild again |
|
@jcsp still see the same conflict |
|
@yuriw yes, you will see that until one or other of the PRs merges and the one one gets rebased. |
|
@jcsp could you rebase your changes? |
Fixes: http://tracker.ceph.com/issues/19412 Signed-off-by: John Spray <john.spray@redhat.com>
Fixes: http://tracker.ceph.com/issues/19412 Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
Reproducers for recent fixes: http://tracker.ceph.com/issues/19407 http://tracker.ceph.com/issues/19258 Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
|
@tchaikov done! |
Depends on #14220 for tests to pass.