Merge ~utkarsh/ubuntu/+source/rabbitmq-server:lp1921425-logrotate-issue-groovy into ubuntu/+source/rabbitmq-server:ubuntu/groovy-devel

[Utkarsh Gupta]

Hello,

This MP intends to fix LP: #1921425, the logrotate issue.

Whilst there are no tests in this package, but the changes are trivial so I don't suspect any problem there.

PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump.

Requesting you to please review and sponsor this. TIA! \o/

[Utkarsh Gupta (utkarsh)]

Also, in the SRU template, I've been a bit hesitant to change the "test plan" section and let the user's tests be there, as-is. I don't expect that to be a problem but I thought it's worth mentioning it once here for the reviewer.

[Christian Ehrhardt  (paelzer)]

Summary - Could you please:
- reduce the fix to just fix the double rotation
- if you want to add the #947873 fix add a LP bug to track/test/discuss about it

---

From the log:
   - Use logrotate daily instead of weekly, and do not override the
     number of logs, so we don't keep too much of them.

While I agree to this for Hirsute - and I agree to fix the double rotation, for the SRU shouldn't we keep weekly (as is) and the number of logs (as is) and only fix the double-rotation to no more happen?

---

Further another "potential regression" is increased disk space consumption as we formerly kept N/2 reasonable logs and now we will keep N. So the amount doubles.

---

While I see how https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947873 is important to logging I don't see a clear path from the bug you try to SRU-fix to that change. This would either need an update to that bug description or filing a new one. But the bug you have is already rather busy (a lot of text), so maybe a new bug would be better.

---

Finally the change will also change the place of the logs
New:
+StandardOutput=append:/var/log/rabbitmq/rabbitmq-server.log
+StandardError=append:/var/log/rabbitmq/rabbitmq-server.error.log
Old:
/usr/lib/rabbitmq/bin/rabbitmq-server "$@" > "/var/log/rabbitmq/startup_log" 2> "/var/log/rabbitmq/startup_err"
Which for an SRU I think is unwanted.

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

Hi Christian,

Thanks for the review. I tend to agree with your thoughts on this. So after looking at this again, I think it's best to keep this upload just for fixing the bug in question (double log rotation) and I've fixed this MP to echo that.

Could you please re-review and sponsor if it's OK now? TIA! \o/

[Christian Ehrhardt  (paelzer)]

Thanks for adapting, and with that change it only became a conffile-only change - which is good as admins will get prompted if they have applied hacks to fix the former issue.

I rechecked and this LGTM now
+1

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/rabbitmq-server
 * [new tag] upload/3.8.5-1ubuntu0.1 -> upload/3.8.5-1ubuntu0.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rabbitmq-server_3.8.5-1ubuntu0.1.dsc: done.
  Uploading rabbitmq-server_3.8.5-1ubuntu0.1.debian.tar.xz: done.
  Uploading rabbitmq-server_3.8.5-1ubuntu0.1_source.buildinfo: done.
  Uploading rabbitmq-server_3.8.5-1ubuntu0.1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This is accepted in F/G-proposed and imported in git-ubuntu

 rabbitmq-server | 3.8.2-0ubuntu1.2 | focal-proposed | source, all
 rabbitmq-server | 3.8.5-1ubuntu0.1 | groovy-proposed | source, all

Closing the MP

diff --git a/debian/changelog b/debian/changelog
index eb96e01..7a56ce1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rabbitmq-server (3.8.5-1ubuntu0.1) groovy; urgency=medium
+
+  [ Thomas Goirand ]
+  * d/rabbitmq-server.logrotate: Do not use a sharedscripts, as
+    rabbitmq-server detects the log rotation by itself. (LP: #1921425)
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 06 Apr 2021 16:24:40 +0530
+
 rabbitmq-server (3.8.5-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 80f9e8b..b52ebee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: rabbitmq-server
 Section: net
 Priority: optional
-Maintainer: Debian OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenStack <[e-mail]>
 Uploaders:
  James Page <[e-mail]>,
  Thomas Goirand <[e-mail]>,
diff --git a/debian/rabbitmq-server.logrotate b/debian/rabbitmq-server.logrotate
index c786df7..86b696a 100644
--- a/debian/rabbitmq-server.logrotate
+++ b/debian/rabbitmq-server.logrotate
@@ -1,12 +1,8 @@
 /var/log/rabbitmq/*.log {
-        weekly
-        missingok
-        rotate 20
-        compress
-        delaycompress
-        notifempty
-        sharedscripts
-        postrotate
-            /etc/init.d/rabbitmq-server rotate-logs > /dev/null
-        endscript
+	weekly
+	missingok
+	rotate 20
+	compress
+	delaycompress
+	notifempty
 }