Merge ~lucaskanashiro/ubuntu/+source/rabbitmq-server:merge-focal into ubuntu/+source/rabbitmq-server:debian/sid

Proposed by Lucas Kanashiro
Status: Merged
Merge reported by: Christian Ehrhardt 
Merged at revision: ea6e847d57962178699dd905744033aafb021a00
Proposed branch: ~lucaskanashiro/ubuntu/+source/rabbitmq-server:merge-focal
Merge into: ubuntu/+source/rabbitmq-server:debian/sid
Diff against target: 77 lines (+38/-3)
3 files modified
debian/changelog (+34/-0)
debian/control (+2/-1)
debian/rabbitmq-server.service (+2/-2)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Ubuntu Server Developers Pending
Review via email: mp+375232@code.launchpad.net

Description of the change

Merge version 3.7.18-1 from Debian. Those are the remaining changes:

    - Resolve issues with startup of RabbitMQ with erlang provided
      epmd daemon (LP: #1808766):
      + d/rabbitmq-server.service: Wants/After epmd.socket, aligning
        with services actually provided by erlang in Ubuntu.
      + d/control: Bump minimum erlang-* package versions to ensure
        compatibility with epmd.socket configuration.

The package builds fine and it was uploaded to this PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-rabbitmq-server-merge/

I ran a basic test to make sure that the package is still working in a focal container:

1 - Install amqp-tools (it contains some helpers to make the interaction with the server side easier):

$ apt install -y amqp-tools

2 - Created a helper shell script with permission to be executed:

$ cat helper.sh
#!/bin/bash

read line
echo "Message: $line"

3 - In one shell instance run the script to consume data (it will be blocked waiting for incoming messages):

$ amqp-consume --server 127.0.0.1 --queue "test" --exchange "amq.topic" --vhost "/" --routing-key "topic1" --declare ./helper.sh

4 - In another shell instance run the following command to publish a message:

$ amqp-publish --exchange "amq.topic" --routing-key "topic1" --body "Testing"

You will see "Message: Testing" in the other shell.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

I'm unsure about the Delta still being needed.

The bump of build depends certainly has no effect as all versions are >1:22 already in focal without alternatives around.
So this part can most likely be dropped.

Even erlang erlang-22.1.6+dfsg still has no @service.
So the other Delta LGTM.

Since the issue back then appeared on s390x, but not on others please enable builds on all arches in a test PPA.
Then I can try this new build before we sponsor it.

Furthermore I wondered if we should report this service issue to Debian for bug 1808766?
This should affect their rabbitmq+erlang as well right?
But there is https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911927 already.
It seems despite it being marked as resolved it isn't fully over yet.

Hmm, maybe it is resolved as-is and we didn't realize.
I'd ask you to:
1. drop the bump to build deps
2. build it on all arches
3. build it on all arches as if it would be a sync

Report the PPA here, then we can test if the old issue might in fact be resolved and we could make this a sync again.

review: Needs Fixing
8c92ca6... by Lucas Kanashiro

   - Resolve issues with startup of RabbitMQ with erlang provided
      epmd daemon (LP: #1808766):
      + d/rabbitmq-server.service: Wants/After epmd.socket, aligning
        with services actually provided by erlang in Ubuntu.

c6a8de1... by Lucas Kanashiro

merge-changelogs

991a041... by Lucas Kanashiro

reconstruct-changelog

ea6e847... by Lucas Kanashiro

update-maintainer

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

As requested I dropped the build deps change from our delta and uploaded it to this PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-rabbitmq-server-merge/

Also uploaded a sync'ed version of this package here: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-rabbitmq-server-sync/

I enabled the other architectures in those PPAs but they have built only in amd64. After raising this during the standup Andreas mentioned the '*_all.deb' files which means they should work in any architecture, so you should be able to run tests with them in any architecture Christian.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks,
I Tested both on s390x where the former issue was happening.

step #1: install and check status
- install - ok on both
- systemctl status epmd.socket epmd.service rabbitmq-server.service
  Ok and identical in both installations
- detection on already running server when calling manually - ok on both

step #2: directly call binary which in the past broke "differently"
- stop service - ok on both
- start manually - ok on both

Looks like:
# /usr/sbin/rabbitmq-server

  ## ##
  ## ## RabbitMQ 3.7.18. Copyright (C) 2007-2019 Pivotal Software, Inc.
  ########## Licensed under the MPL. See https://www.rabbitmq.com/
  ###### ##
  ########## Logs: /<email address hidden>
                    /var/log/rabbitmq/rabbit@f-check-rabbitmq_upgrade.log

              Starting broker...
 completed with 0 plugins.

So the former issue is in deed gone and this could be a sync.

Note: this warning sounds dangerous "Elixir is running in a system with a different endianness than the one its source code was compiled in. Please make sure ..." while no elexir binary is installed oO ?! But that would be a story on its own.

TL;DR: old delta no more needed, can be a sync.
If you also agree Lucas let me know and I can call syncpackage for it.

Ack (as sync)

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

A sync sounds reasonable Christian, could you do it please?

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Syncing the version we both tested.

$ syncpackage -r focal-proposed -d unstable -v -V3.7.18-1 rabbitmq-server --force
syncpackage: D: Source package rabbitmq-server is temporarily blacklisted (blacklisted_current). Ubuntu ignores these for now. See also LP: #841372
syncpackage: Source rabbitmq-server -> focal/Proposed: current version 3.7.8-4ubuntu2, new version 3.7.18-1
syncpackage: I: Good signature by Thomas Goirand <email address hidden> (0xD416AD15AC6B43FE)
syncpackage: I: Good signature by James Page <email address hidden> (0xBFECAECBA0E7D8C3)
syncpackage: New changes:
rabbitmq-server (3.7.18-1) unstable; urgency=medium

  * New upstream release.
    - Can be built with Elixir 1.9.x (Closes: #939881).
  * Re-add debian/gbp.conf, as this package must use pristine-tar.
  * Fix display of version when doing rabbitmqadmin --version. Used a different
    way from proposed patch which isn't invasive (Closes: #908690).
  * Using python3 as binary, not python (Closes: #883192).

 -- Thomas Goirand <email address hidden> Mon, 23 Sep 2019 10:05:48 +0200

rabbitmq-server (3.7.8-5) unstable; urgency=medium

  [ Ondřej Nový ]
  * Removing gbp.conf, not used anymore or should be specified in the
    developers dotfiles.
  * Use debhelper-compat instead of debian/compat.

  [ Thomas Goirand ]
  * Also package rabbitmq-diagnostics.

 -- Thomas Goirand <email address hidden> Mon, 17 Jun 2019 22:59:25 +0200
Sync this package [y|N]? y
syncpackage: Request succeeded; you should get an e-mail once it is processed.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

As usual please check proposed-migration in a few hours

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

FTR rabbitmq-server version 3.7.18-1 is already available in focal: https://launchpad.net/ubuntu/+source/rabbitmq-server

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 5690f5d..1fc5834 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,13 @@
6+rabbitmq-server (3.7.18-1ubuntu1) focal; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - Resolve issues with startup of RabbitMQ with erlang provided
10+ epmd daemon (LP: #1808766):
11+ + d/rabbitmq-server.service: Wants/After epmd.socket, aligning
12+ with services actually provided by erlang in Ubuntu.
13+
14+ -- Lucas Kanashiro <lucas.kanashiro@canonical.com> Thu, 07 Nov 2019 15:55:47 -0300
15+
16 rabbitmq-server (3.7.18-1) unstable; urgency=medium
17
18 * New upstream release.
19@@ -21,6 +31,30 @@ rabbitmq-server (3.7.8-5) unstable; urgency=medium
20
21 -- Thomas Goirand <zigo@debian.org> Mon, 17 Jun 2019 22:59:25 +0200
22
23+rabbitmq-server (3.7.8-4ubuntu2) disco; urgency=medium
24+
25+ * Resolve issues with startup of RabbitMQ with erlang provided
26+ epmd daemon (LP: #1808766):
27+ - d/rabbitmq-server.service: Wants/After epmd.socket, aligning
28+ with services actually provided by erlang in Ubuntu.
29+ - d/control: Bump minimum erlang-* package versions to ensure
30+ compatibility with epmd.socket configuration.
31+
32+ -- James Page <james.page@ubuntu.com> Tue, 18 Dec 2018 09:18:27 +0000
33+
34+rabbitmq-server (3.7.8-4ubuntu1) disco; urgency=medium
35+
36+ [ Corey Bryant ]
37+ * d/gbp.conf: Update gbp configuration file.
38+ * d/control: Update Vcs-* links and maintainers.
39+ * d/control: Set minimum erlang dependencies to 1:21.1.1, according to
40+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909941#32.
41+
42+ [ James Page ]
43+ * d/control,rules: Switch to using Python 3.
44+
45+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 16 Nov 2018 10:36:50 +0000
46+
47 rabbitmq-server (3.7.8-4) unstable; urgency=medium
48
49 * Remove Elixir version patch.
50diff --git a/debian/control b/debian/control
51index 0332aa8..9b5e100 100644
52--- a/debian/control
53+++ b/debian/control
54@@ -1,7 +1,8 @@
55 Source: rabbitmq-server
56 Section: net
57 Priority: optional
58-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
59+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
60+XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
61 Uploaders:
62 James Page <james.page@ubuntu.com>,
63 Thomas Goirand <zigo@debian.org>,
64diff --git a/debian/rabbitmq-server.service b/debian/rabbitmq-server.service
65index c23ebb9..6f7af39 100644
66--- a/debian/rabbitmq-server.service
67+++ b/debian/rabbitmq-server.service
68@@ -1,7 +1,7 @@
69 [Unit]
70 Description=RabbitMQ Messaging Server
71-After=network.target epmd@0.0.0.0.socket
72-Wants=network.target epmd@0.0.0.0.socket
73+After=network.target epmd.socket
74+Wants=network.target epmd.socket
75
76 [Service]
77 Type=notify

Subscribers

People subscribed via source and target branches