From: Adam King Date: Fri, 20 Jan 2023 18:42:00 +0000 (-0500) Subject: cephadm: don't overwrite cluster logrotate file X-Git-Tag: v16.2.13~171^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F49927%2Fhead;p=ceph.git cephadm: don't overwrite cluster logrotate file To allow users to customize the file if they need to akter the settings (e.g. to change the rotation interval or rotate based on size) Fixes: https://tracker.ceph.com/issues/58527 Signed-off-by: Adam King (cherry picked from commit f33dc8a17e7f5093b062022dacc72a1afc1a4d7a) --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index d6965594669..23e2b1bf873 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3427,6 +3427,10 @@ def install_base_units(ctx, fsid): call_throws(ctx, ['systemctl', 'enable', 'ceph-%s.target' % fsid]) call_throws(ctx, ['systemctl', 'start', 'ceph-%s.target' % fsid]) + # don't overwrite file in order to allow users to manipulate it + if os.path.exists(ctx.logrotate_dir + f'/ceph-{fsid}'): + return + # logrotate for the cluster with open(ctx.logrotate_dir + '/ceph-%s' % fsid, 'w') as f: """