Merge ~paelzer/ubuntu/+source/rabbitmq-server:lp-1988283-fix-mnesia-error-JAMMY into ubuntu/+source/rabbitmq-server:ubuntu/jammy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-1988283-rabbitmq-crashes-mnesia/+packages

[Paride Legovini (paride)]

I would squash the two d/changelog commits; for the rest the patch itself, headers and other packaging changes all LGTM. The package built fine in the PPA.

One nit on the patch file: the

  From: =?UTF-8?...

thing is a bit ugly and I think nothing is going to parse it.

Approving but the Kinetic fix [1] should land first.

[1] https://code.launchpad.net/~paelzer/ubuntu/+source/rabbitmq-server/+git/rabbitmq-server/+merge/429625

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, paride
Uploaders: paelzer, paride
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

This lacks engagement from the reporter, I want to get it out of our team overview - therefore I'm reassigning "Canonical Server Reporter" to myself.

Unmerged commits

8713f84... by Christian Ehrhardt  on 2022-09-08

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

fc6b2c9... by Christian Ehrhardt  on 2022-09-08

changelog: 3.9.13-1ubuntu0.1 as SRU to fix (LP: #1988283)

Signed-off-by: Christian Ehrhardt <email address hidden>

7f0eaa0... by Christian Ehrhardt  on 2022-09-08

changelog: 3.9.13-1ubuntu1 to fix (LP: #1988283)

Signed-off-by: Christian Ehrhardt <email address hidden>

1c86f04... by Christian Ehrhardt  on 2022-09-08

d/p/lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch: fix bug that crashes the prometheus_mnesia collector (LP: #1988283)

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index c53574d..e059bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rabbitmq-server (3.9.13-1ubuntu0.1) jammy; urgency=medium
+
+  * d/p/lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch:
+    fix bug that crashes the prometheus_mnesia collector (LP: #1988283)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 08 Sep 2022 09:32:30 +0200
+
 rabbitmq-server (3.9.13-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 001af0e..bdd2c79 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/patches/lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch b/debian/patches/lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch
new file mode 100644
index 0000000..ca1aa10
--- /dev/null
+++ b/debian/patches/lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch
@@ -0,0 +1,57 @@
+From ffe2bf711659f5ee11970b8a60f7f0f72fc68770 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <[e-mail]>
+Date: Wed, 30 Mar 2022 09:10:00 +0200
+Subject: [PATCH] Handle case where mnesia:table_info/2 returns undefined
+ (#140)
+
+Origin: upstream, https://github.com/deadtrickster/prometheus.erl/commit/ffe2bf711659f5ee11970b8a60f7f0f72fc68770
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1988283
+Applied-Upstream: 4.8.2 (prometheur.erl) 3.9.15 (rabbitmq)
+Last-Update: 2022-09-08
+
+---
+ .../mnesia/prometheus_mnesia_collector.erl       | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/deps/prometheus/src/collectors/mnesia/prometheus_mnesia_collector.erl b/deps/prometheus/src/collectors/mnesia/prometheus_mnesia_collector.erl
+index ef2ce18..811d483 100644
+--- a/deps/prometheus/src/collectors/mnesia/prometheus_mnesia_collector.erl
++++ b/deps/prometheus/src/collectors/mnesia/prometheus_mnesia_collector.erl
+@@ -196,7 +196,7 @@ metric_enabled(Name, Metrics) ->
+ get_memory_usage() ->
+   WordSize = erlang:system_info(wordsize),
+   Calculator = fun(Tab, Sum) ->
+-                 mnesia:table_info(Tab, memory) + Sum
++                 table_info(Tab, memory) + Sum
+                end,
+   lists:foldl(Calculator, 0, mnesia:system_info(tables)) * WordSize.
+ 
+@@ -204,13 +204,23 @@ get_tablewise_memory_usage() ->
+   WordSize = erlang:system_info(wordsize),
+   Calculator =
+     fun(Tab, Acc) ->
+-      [{[{table, Tab}], mnesia:table_info(Tab, memory) * WordSize} | Acc]
++      [{[{table, Tab}], table_info(Tab, memory) * WordSize} | Acc]
+     end,
+   lists:foldl(Calculator, [], mnesia:system_info(tables)).
+ 
+ get_tablewise_size() ->
+   Calculator =
+     fun(Tab, Acc) ->
+-      [{[{table, Tab}], mnesia:table_info(Tab, size)} | Acc]
++      [{[{table, Tab}], table_info(Tab, size)} | Acc]
+     end,
+   lists:foldl(Calculator, [], mnesia:system_info(tables)).
++
++%% mnesia:table_info/2 may return 'undefined' when the table should
++%% be loaded on the local node but hasn't been loaded yet.
++%%
++%% https://github.com/erlang/otp/issues/5830
++table_info(Tab, Item) ->
++    case mnesia:table_info(Tab, Item) of
++        undefined -> 0;
++        Val -> Val
++    end.
+-- 
+2.37.3
+
diff --git a/debian/patches/series b/debian/patches/series
index fbc189a..7d43a61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 lets-use-python3-not-python-binary.patch
 rabbitmq-dist.mk.patch
+lp1988283-Handle-case-where-mnesia-table_info-2-returns-undefi.patch