From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 10 Mar 2017 16:25:35 +0000 (-0500)
Subject: rgw: fix transition from full to incremental meta sync
X-Git-Tag: v12.0.1~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0705cef395f8dc0d73b30ddaac268cc1e6546a30;p=ceph.git

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 <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 5925f556dfab..3e21ce3a2599 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -1485,7 +1485,7 @@ public:
 	  using WriteMarkerCR = RGWSimpleRadosWriteCR<rgw_meta_sync_marker>;
 	  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) {