Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rgw: kill a compile warning for rgw_sync #10425

Merged
merged 1 commit into from Aug 10, 2016
Merged

rgw: kill a compile warning for rgw_sync #10425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/rgw/rgw_sync.cc
View file
Open in desktop
Expand Up @@ -1459,18 +1459,18 @@ class RGWMetaSyncShardCR : public RGWCoroutine {

if (!lost_lock) {
/* update marker to reflect we're done with full sync */
if (can_adjust_marker) yield {
sync_marker.state = rgw_meta_sync_marker::IncrementalSync;
sync_marker.marker = sync_marker.next_step_marker;
sync_marker.next_step_marker.clear();

RGWRados *store = sync_env->store;
ldout(sync_env->cct, 0) << *this << ": saving marker pos=" << sync_marker.marker << dendl;
using WriteMarkerCR = RGWSimpleRadosWriteCR<rgw_meta_sync_marker>;
call(new WriteMarkerCR(sync_env->async_rados, store, pool,
sync_env->shard_obj_name(shard_id),
sync_marker));
if (can_adjust_marker) {
sync_marker.state = rgw_meta_sync_marker::IncrementalSync;
sync_marker.marker = sync_marker.next_step_marker;
sync_marker.next_step_marker.clear();
ldout(sync_env->cct, 0) << *this << ": saving marker pos=" << sync_marker.marker << dendl;

using WriteMarkerCR = RGWSimpleRadosWriteCR<rgw_meta_sync_marker>;
yield call(new WriteMarkerCR(sync_env->async_rados, sync_env->store,
pool, sync_env->shard_obj_name(shard_id),
sync_marker));
}

if (retcode < 0) {
ldout(sync_env->cct, 0) << "ERROR: failed to set sync marker: retcode=" << retcode << dendl;
return retcode;
Expand Down