Skip to content
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

ceph.spec.in: do not install Ceph RA on systemd platforms #7894

Merged
2 commits merged into from Mar 16, 2016

Conversation

smithfarm
Copy link
Contributor

The ceph-resource-agents package consists of two RAs: the "Ceph RA" (which includes RAs for OSD, MON, and MDS) and the "RBD RA". Since the Ceph RA wraps the Ceph sysvinit script, it cannot be used on systemd-based platforms. The RBD RA is OK on systemd.

http://tracker.ceph.com/issues/14828 Fixes: #14828

This patch aligns the spec file with src/ocf/Makefile.am, which
installs the resource agents in $(prefix)/lib/ocf.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
The Ceph Resource Agent (RA) wraps the Ceph init script and is incompatible
with systemd.

http://tracker.ceph.com/issues/14828 Fixes: ceph#14828

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

Continuation of #7810

@smithfarm
Copy link
Contributor Author

I manually tested this by building in OBS and installing the ceph-resource-agents RPM on openSUSE Tumbleweed. Confirmed that only the RBD RA is installed.

@tserong
Copy link
Contributor

tserong commented Mar 14, 2016

Looks good to me Reviewed-by: Tim Serong <tserong@suse.com>

@smithfarm smithfarm added this to the jewel milestone Mar 14, 2016
@smithfarm
Copy link
Contributor Author

@ktdreyer Who should I ask to review this? The issue it is fixing is as follows: the Ceph Resource Agents are useless on systemd platforms because they wrap /etc/init.d/ceph.

@smithfarm
Copy link
Contributor Author

upgrade/infernalis-x running now at http://149.202.162.67:8081/ubuntu-2016-03-15_07:45:21-upgrade:infernalis-x-wip-14828---basic-openstack/

cw ceph-qa-suite --verbose --suite upgrade/infernalis-x --suite-branch master \
--ceph wip-14828 --ceph-git-url https://github.com/SUSE/ceph

@smithfarm
Copy link
Contributor Author

Tore down that run after looking at http://pulpito.ovh.sepia.ceph.com:8081/?branch=jewel and seeing that it would be affected by http://tracker.ceph.com/issues/15123 which is fixed by #8073

Rolled a new wip branch including the fix for this issue. New upgrade/infernalis-x run in OVH:

cw ceph-qa-suite --verbose --suite upgrade/infernalis-x --suite-branch master \
--ceph wip-14828-with-fsmap-fix --ceph-git-url https://github.com/SUSE/ceph

http://149.202.190.143:8081/ubuntu-2016-03-15_08:53:39-upgrade:infernalis-x-wip-14828-with-fsmap-fix---basic-openstack/

@liewegas
Copy link
Member

lgtm in principle; feel free to merge once you're satisfied with the testing.

@smithfarm smithfarm assigned ghost Mar 16, 2016
@smithfarm
Copy link
Contributor Author

@dachary This passed the upgrade:infernalis-x/parallel/{4-jewel.yaml 0-cluster/start.yaml 1-infernalis-install/infernalis.yaml 2-workload/{ec-rados-default.yaml rados_api.yaml rados_loadgenbig.yaml test_rbd_api.yaml test_rbd_python.yaml} 3-upgrade-sequence/upgrade-all.yaml 5-final-workload/{rados-snaps-few-objects.yaml rados_loadgenmix.yaml rados_mon_thrash.yaml rbd_cls.yaml rbd_import_export.yaml rgw_swift.yaml} distros/centos_7.2.yaml} test here:

Do you think that is sufficient to demonstrate that it doesn't break anything?

ghost pushed a commit that referenced this pull request Mar 16, 2016
 ceph.spec.in: do not install Ceph RA on systemd platforms

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost merged commit 6364e5f into ceph:master Mar 16, 2016
@smithfarm smithfarm deleted the wip-14828 branch March 20, 2016 13:03
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants