RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26190 from cbodley/wip-rgw-datalog-last-trim

Browse Source 
rgw multisite: only update last_trim marker on ENODATA

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
This commit is contained in:
Casey Bodley 2019-01-31 12:37:09 -05:00 committed by GitHub
commit e6c2da1e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_cr_rados.cc
View File

@ -1,6 +1,7 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab // vim: ts=8 sw=2 smarttab
#include "include/compat.h"
#include "rgw_rados.h" #include "rgw_rados.h"
#include "rgw_zone.h" #include "rgw_zone.h"
#include "rgw_coroutine.h" #include "rgw_coroutine.h"
@ -819,9 +820,10 @@ RGWSyncLogTrimCR::RGWSyncLogTrimCR(RGWRados *store, const std::string& oid,
int RGWSyncLogTrimCR::request_complete() int RGWSyncLogTrimCR::request_complete()
{ {
int r = RGWRadosTimelogTrimCR::request_complete(); int r = RGWRadosTimelogTrimCR::request_complete();
if (r < 0 && r != -ENODATA) { if (r != -ENODATA) {
return r; return r;
} }
// nothing left to trim, update last_trim_marker
if (*last_trim_marker < to_marker) { if (*last_trim_marker < to_marker) {
*last_trim_marker = to_marker; *last_trim_marker = to_marker;
} }