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
jewel: build/ops: remove SYSTEMD_RUN from initscript #9872
Conversation
Changelog:
|
@odivlad Thanks for the backport! Next time, though, please wait until the master PR has been merged and then do the backports using "git cherry-pick -x" so we have the xref to the master SHA1 in the commit message. |
92283d4
to
3b4b1d3
Compare
@smithfarm, since my PR to master (#9871) is already merged, please, remove [DNM] prefix. |
@odivlad Please update the commit message with a description of how the conflicts were resolved (for use in possible future forensic analyses). |
@smithfarm, can you please provide the example of such description? |
@odivlad you can "git log origin/hammer" for some examples. like in 4eea92b
and in a2e7ca1
|
3b4b1d3
to
f17ebd7
Compare
done |
aed887d
to
389203d
Compare
If a lead weighs in saying this should be backported to jewel, then I'm OK with it. Otherwise not. See discussion in #9871. |
`systemd-run` logic in initscripts was introduced because of ticket http://tracker.ceph.com/issues/7627. If we have systemd-based operating system, we should use systemd unit files from systemd directory to start/stop ceph daemons. Otherwise, `daemon()` from `/etc/init.d/functions` on systemd distro starts service in `system.slice` and everything works well. `systemd-run` can not be run on non-systemd distros, so it's not needed on SysV systems. also, ceph-disk is now able to run the "systemctl" to enable and start the ceph-osd, and ceph-deploy is also now playing well with systemd when it comes to ceph-mon and ceph-mds Fixes: http://tracker.ceph.com/issues/16440 Signed-off-by: Vladislav Odintsov <odivlad@gmail.com> (cherry picked from commit 1fd4f92)
389203d
to
cca589f
Compare
@smithfarm, I've updated PR with patching only radosgw initscripts. |
@oritwas wrote that she is OK to merge this, so I'm removing DNM. |
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Closes: http://tracker.ceph.com/issues/16441
systemd-run
logic in initscripts was introduced because of ticket http://tracker.ceph.com/issues/7627.If we have systemd-based distro, we should use systemd unit files from systemd directory to start/stop ceph daemons.
Otherwise,
daemon()
from/etc/init.d/functions
on systemd distro starts service insystem.slice
and everything works well for case, for example, when we use hammer on RH7. With this code it will start daemon withdaemon()
function frominit.d/functions
.systemd-run
can not be run on non-systemd distros, so it's not needed on SysV systems.Backport of: #9871
Signed-off-by: Vladislav Odintsov odivlad@gmail.com