From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 17 Dec 2019 19:26:56 +0000 (-0500)
Subject: rgw: data sync markers include timestamp from datalog entry
X-Git-Tag: v14.2.8~78^2~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f845b0bca7589d550df7a1eea33187bf358d6526;p=ceph.git

rgw: data sync markers include timestamp from datalog entry

this corrects the output of 'radosgw-admin data sync status' to show the
timestamp of the last datalog entry applied

Fixes: https://tracker.ceph.com/issues/43359

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b403e011185a98a7ae2d3fb6246f0b1131a5f9a9)
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 0920e66ecf2..515bdcb5228 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -902,6 +902,7 @@ public:
   RGWCoroutine *store_marker(const string& new_marker, uint64_t index_pos, const real_time& timestamp) override {
     sync_marker.marker = new_marker;
     sync_marker.pos = index_pos;
+    sync_marker.timestamp = timestamp;
 
     tn->log(20, SSTR("updating marker marker_oid=" << marker_oid << " marker=" << new_marker));
     RGWRados *store = sync_env->store;