New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr: fix python module teardown & add tests #14232

Merged
merged 5 commits into from Apr 21, 2017

Conversation

Projects
None yet
4 participants
@jcsp
Contributor

jcsp commented Mar 29, 2017

Depends on #14220 for tests to pass.

@jcsp jcsp requested review from tchaikov and liewegas Mar 29, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Mar 30, 2017

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!")

This comment has been minimized.

@tchaikov

tchaikov Mar 31, 2017

Contributor

daemons.

This comment has been minimized.

@jcsp

jcsp Apr 15, 2017

Contributor

This line was being removed anyway

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))

This comment has been minimized.

@tchaikov

tchaikov Mar 31, 2017

Contributor

can we use "MGRS_REQUIRED" for the sake of consistency?

This comment has been minimized.

@jcsp

jcsp Apr 15, 2017

Contributor

Done

@@ -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__()

This comment has been minimized.

@tchaikov

tchaikov Mar 31, 2017

Contributor

just out of curiosity, why don't use

str(max(max_required_mgr, 1))

This comment has been minimized.

@jcsp

jcsp Apr 15, 2017

Contributor

No reason, they're completely equivalent afaik

@tchaikov tchaikov added the needs-qa label Apr 14, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 14, 2017

@jcsp lgtm modulo some nits.

@yuriw

This comment has been minimized.

Contributor

yuriw commented Apr 14, 2017

@jcsp pls rebase

remote: Counting objects: 21, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 21 (delta 15), reused 14 (delta 14), pack-reused 4
Unpacking objects: 100% (21/21), done.
From https://github.com/jcsp/ceph

  • branch wip-19412 -> FETCH_HEAD
    Auto-merging src/mgr/PyModules.cc
    CONFLICT (content): Merge conflict in src/mgr/PyModules.cc
    Auto-merging src/mgr/MgrPyModule.cc
    Auto-merging qa/tasks/vstart_runner.py
    Automatic merge failed; fix conflicts and then commit the result.
@liewegas

This comment has been minimized.

Member

liewegas commented Apr 14, 2017

those might be conflicts with #14507 btw

@jcsp

This comment has been minimized.

Contributor

jcsp commented Apr 15, 2017

Pushed an update (this did not need rebase, as sage says it is just conflicting with the other outstanding PR)

@yuriw

This comment has been minimized.

Contributor

yuriw commented Apr 17, 2017

Will try to rebuild again

@yuriw

This comment has been minimized.

Contributor

yuriw commented Apr 17, 2017

@jcsp still see the same conflict

@jcsp

This comment has been minimized.

Contributor

jcsp commented Apr 18, 2017

@yuriw yes, you will see that until one or other of the PRs merges and the one one gets rebased.

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 20, 2017

@jcsp could you rebase your changes?

John Spray added some commits Mar 29, 2017

John Spray
mgr: fix MgrPyModule destruction
Fixes: http://tracker.ceph.com/issues/19412
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray
qa: fix vstart_runner --create for mgr tests
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray
qa: additions to mgr.test_failover
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>
John Spray
qa: s/REQUIRE_MGRS/MGRS_REQUIRED/ for consistency
Signed-off-by: John Spray <john.spray@redhat.com>
@jcsp

This comment has been minimized.

Contributor

jcsp commented Apr 20, 2017

@tchaikov done!

@tchaikov

This comment has been minimized.

@tchaikov tchaikov merged commit c237e7e into ceph:master Apr 21, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment