Merge pull request ceph#53676 from smanjara/data-sync-fairness-crash

cbodley · web-flow · commit 84dcf80155ac · 2023-10-02T15:36:07.000+01:00
rgw/multisite: call drain before flushing markers in incremental sync

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -2121,11 +2121,12 @@ class RGWDataIncSyncShardCR : public RGWDataBaseSyncShardCR {
 	}
       } while (true);
 
+      drain_all();
+      yield marker_tracker->flush();
+
       if (lost_bid) {
         return set_cr_error(-EBUSY);
       } else if (lost_lock) {
-        drain_all();
-        yield marker_tracker->flush();
         return set_cr_error(-ECANCELED);
       }
 

Original file line number	Diff line number	Diff line change
`@@ -2121,11 +2121,12 @@ class RGWDataIncSyncShardCR : public RGWDataBaseSyncShardCR {`
`2121`	`2121`	`}`
`2122`	`2122`	`} while (true);`
`2123`	`2123`
	`2124`	`+ drain_all();`
	`2125`	`+ yield marker_tracker->flush();`
	`2126`	`+`
`2124`	`2127`	`if (lost_bid) {`
`2125`	`2128`	`return set_cr_error(-EBUSY);`
`2126`	`2129`	`} else if (lost_lock) {`
`2127`		`- drain_all();`
`2128`		`- yield marker_tracker->flush();`
`2129`	`2130`	`return set_cr_error(-ECANCELED);`
`2130`	`2131`	`}`
`2131`	`2132`