From 0705cef395f8dc0d73b30ddaac268cc1e6546a30 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 10 Mar 2017 11:25:35 -0500 Subject: [PATCH] rgw: fix transition from full to incremental meta sync when transitioning to incremental sync, we need to write temp_marker instead of sync_marker, because temp_marker has replaced the full sync marker (which is a metadata key, rather than an log marker) with next_step_marker this was breaking the metadata checkpoint in test_multi.py, because it was comparing metadata keys (i.e. 'user:zone.user') against mdlog markers Signed-off-by: Casey Bodley --- src/rgw/rgw_sync.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc index 5925f556dfa..3e21ce3a259 100644 --- a/src/rgw/rgw_sync.cc +++ b/src/rgw/rgw_sync.cc @@ -1485,7 +1485,7 @@ public: using WriteMarkerCR = RGWSimpleRadosWriteCR; yield call(new WriteMarkerCR(sync_env->async_rados, sync_env->store, rgw_raw_obj(pool, sync_env->shard_obj_name(shard_id)), - sync_marker)); + *temp_marker)); } if (retcode < 0) { -- 2.39.5