summaryrefslogtreecommitdiff
path: root/0009-librgw-notifications-initialize-kafka-and-amqp.patch
diff options
context:
space:
mode:
Diffstat (limited to '0009-librgw-notifications-initialize-kafka-and-amqp.patch')
-rw-r--r--0009-librgw-notifications-initialize-kafka-and-amqp.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/0009-librgw-notifications-initialize-kafka-and-amqp.patch b/0009-librgw-notifications-initialize-kafka-and-amqp.patch
new file mode 100644
index 0000000..17a12ae
--- /dev/null
+++ b/0009-librgw-notifications-initialize-kafka-and-amqp.patch
@@ -0,0 +1,63 @@
+From 178f6bdac97b57300bbe0956633cf686a7e3ccee Mon Sep 17 00:00:00 2001
+From: Yuval Lifshitz <ylifshit@redhat.com>
+Date: Fri, 12 Mar 2021 08:56:45 +0200
+Subject: [PATCH] librgw/notifications: initialize kafka and amqp
+
+Fixes: https://tracker.ceph.com/issues/49738
+
+Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
+---
+ src/rgw/librgw.cc | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
+index 012cc54c3b..a5351dbe7c 100644
+--- a/src/rgw/librgw.cc
++++ b/src/rgw/librgw.cc
+@@ -53,6 +53,12 @@
+ #include "rgw_http_client.h"
+ #include "rgw_http_client_curl.h"
+ #include "rgw_perf_counters.h"
++#ifdef WITH_RADOSGW_AMQP_ENDPOINT
++#include "rgw_amqp.h"
++#endif
++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
++#include "rgw_kafka.h"
++#endif
+
+ #include "services/svc_zone.h"
+
+@@ -617,6 +623,17 @@ namespace rgw {
+ /* ignore error */
+ }
+
++#ifdef WITH_RADOSGW_AMQP_ENDPOINT
++ if (!rgw::amqp::init(cct.get())) {
++ derr << "ERROR: failed to initialize AMQP manager" << dendl;
++ }
++#endif
++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
++ if (!rgw::kafka::init(cct.get())) {
++ derr << "ERROR: failed to initialize Kafka manager" << dendl;
++ }
++#endif
++
+ return 0;
+ } /* RGWLib::init() */
+
+@@ -645,6 +662,12 @@ namespace rgw {
+ rgw_shutdown_resolver();
+ rgw_http_client_cleanup();
+ rgw::curl::cleanup_curl();
++#ifdef WITH_RADOSGW_AMQP_ENDPOINT
++ rgw::amqp::shutdown();
++#endif
++#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
++ rgw::kafka::shutdown();
++#endif
+
+ rgw_perf_stop(g_ceph_context);
+
+--
+2.26.2
+