]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw/amqp/kafka: prevent cuncurrent shutdowns from happening 40381/head
authorYuval Lifshitz <ylifshit@redhat.com>
Thu, 19 Nov 2020 15:33:22 +0000 (17:33 +0200)
committersinguliere <singuliere@autistici.org>
Sun, 11 Apr 2021 21:41:41 +0000 (23:41 +0200)
commitba0b8061a92c68d6c2ee03469269a344721264da
tree6bd49807d80c131e1bfab8f5123009c4f2b5e5ec
parentd216585e22bc8157093a922a6a86f4b8eea2f9d3
rgw/amqp/kafka: prevent cuncurrent shutdowns from happening

this may be causing radosgw-admin and possibly radosgw to hang during
shutdown

fixes: https://tracker.ceph.com/issues/48293

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit b6424fa85fd61101f9becd9fb945b73d55019f82)

Conflicts: src/rgw/rgw_admin.cc
       exclude this hunk from the backport because octopus still
       needs it for the commands that were removed in
       4c486c32c6dc21d8650d8ec2e446950d82631be5. In addition this hunk
       is a cleanup unrelated to the backport.
src/rgw/rgw_sync_module_pubsub.cc
src/rgw/rgw_sync_module_pubsub.h