RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37882 from cbodley/wip-rgw-data-sync-notification-fix

Browse Source 
rgw: data sync: fix obligation check

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Casey Bodley 2021-01-08 15:16:23 -05:00 committed by GitHub
commit 66cafc8312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rgw/rgw_data_sync.cc
View File

@ -1317,7 +1317,8 @@ public:
// loop until the latest obligation is satisfied, because other callers
// may update the obligation while we're syncing
while (state->progress_timestamp < state->obligation->timestamp &&
while ((state->obligation->timestamp == ceph::real_time() ||
state->progress_timestamp < state->obligation->timestamp) &&
obligation_counter != state->counter) {
obligation_counter = state->counter;
progress = ceph::real_time{};