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

debian: sync logrotate packaging with downstream #15567

Merged
merged 1 commit into from Jun 9, 2017

Conversation

Projects
None yet
3 participants
@Fabian-Gruenbichler
Contributor

Fabian-Gruenbichler commented Jun 8, 2017

both Ubuntu and Debian put the logrotate script into
ceph-common, to ensure that radosgw logs are rotated as
well.

to prevent duplicate logrotate scripts handling the same log
files, and to minimize the delta between upstream and
downstream packaging, sync this change back upstream.

Fixes: http://tracker.ceph.com/issues/19938

Signed-off-by: Fabian Grünbichler f.gruenbichler@proxmox.com

@Fabian-Gruenbichler

This comment has been minimized.

Contributor

Fabian-Gruenbichler commented Jun 8, 2017

supersedes #15514

@Fabian-Gruenbichler

This comment has been minimized.

Contributor

Fabian-Gruenbichler commented Jun 8, 2017

in case a user using the upstream packages has modified the old ceph.logrotate script, an (ignored) backup copy will be created as ceph.logrotate.dpkg-bak, and this information will be printed by apt(-get) during the upgrade.

in case the user switches from downstream to upstream packages, the usual prompt for a locally modified configuration file will be done during the upgrade (if there are any local modifications to the ceph-common logrotate script).

@liewegas liewegas requested a review from javacruft Jun 8, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 8, 2017

Sounds good to me!

@javacruft

👍

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 8, 2017

thanks!

debian: sync logrotate packaging with downstream
both Ubuntu and Debian put the logrotate script into
ceph-common, to ensure that radosgw logs are rotated as
well.

to prevent duplicate logrotate scripts handling the same log
files, and to minimize the delta between upstream and
downstream packaging, sync this change back upstream.

Fixes: http://tracker.ceph.com/issues/19938

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
@Fabian-Gruenbichler

This comment has been minimized.

Contributor

Fabian-Gruenbichler commented Jun 8, 2017

hopefully final version based on the following analysis of currently released upstream Debian Jessie packages:

$ for i in *; do echo $i; dpkg --contents $i | grep "logrotate"; done
ceph_0.94.9-1~bpo80+1_amd64.deb
drwxr-xr-x root/root         0 2016-08-30 13:59 ./etc/logrotate.d/
-rw-r--r-- root/root      1275 2016-08-30 13:59 ./etc/logrotate.d/ceph
ceph_10.2.7-1~bpo80+1_amd64.deb
ceph_11.2.0-1~bpo80+1_amd64.deb
ceph_12.0.3-1~bpo80+1_amd64.deb
ceph-base_10.2.7-1~bpo80+1_amd64.deb
drwxr-xr-x root/root         0 2017-04-10 14:43 ./etc/logrotate.d/
-rw-r--r-- root/root       228 2017-04-10 14:43 ./etc/logrotate.d/ceph.logrotate
ceph-base_11.2.0-1~bpo80+1_amd64.deb
ceph-base_12.0.3-1~bpo80+1_amd64.deb
drwxr-xr-x root/root         0 2017-05-16 15:49 ./etc/logrotate.d/
-rw-r--r-- root/root       237 2017-05-16 15:49 ./etc/logrotate.d/ceph
ceph-common_0.94.9-1~bpo80+1_amd64.deb
ceph-common_10.2.7-1~bpo80+1_amd64.deb
ceph-common_11.2.0-1~bpo80+1_amd64.deb
ceph-common_12.0.3-1~bpo80+1_amd64.deb
  • Hammer has the logrotate script installed via ceph, as /etc/logrotate.d/ceph
  • Jewel split the ceph package into multiple packages, the logrotate script was installed via ceph-base as /etc/logrotate.d/ceph.logrotate
  • Kraken (and early Luminous) lost the logrotate script altogether.
  • Luminous (and current master since 17ca501) installs it via ceph-base, but under the old /etc/logrotate.d/ceph path

I propose cleaning up both old paths, and moving the logrotate script to the downstream variant of package ceph-common, path /etc/logrotate.d/ceph-common. Backporting to Kraken should work fine, Jewel could do a manual move similar to what is proposed in #15428 , but to ceph-common?

before merging this into the individual release branches, the next version of that release could be added as prior_version to the rm_conffile calls (or it could simply be dropped with Luminous+1 or +2, retrying the cleanup on every package upgrade? the overhead should be small enough..)

@liewegas liewegas merged commit 6f561c8 into ceph:master Jun 9, 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

@Fabian-Gruenbichler Fabian-Gruenbichler deleted the Fabian-Gruenbichler:pull/logrotatesync branch Jun 9, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment