From: Shilpa Jagannath <smanjara@redhat.com>
Date: Sat, 7 Sep 2024 01:43:28 +0000 (-0400)
Subject: rgw/multisite: drain_all() after notify stack cancel
X-Git-Tag: v19.2.3~217^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cfa58be4c41ad6e83f77e7a667c83e90cb17147;p=ceph.git

rgw/multisite: drain_all() after notify stack cancel

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit ed3312085b321a69778747fbda7e9c97206c3b21)

Fixes: https://tracker.ceph.com/issues/68298
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
index c4a19291f415..5d3d967de550 100644
--- a/src/rgw/driver/rados/rgw_data_sync.cc
+++ b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -2555,6 +2555,7 @@ public:
       }
 
       notify_stack->cancel();
+      drain_all();
 
       return set_cr_done();
     }