From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 8 Mar 2016 22:14:05 +0000 (-0800)
Subject: rgw: handle error when fetching data log changes
X-Git-Tag: v10.1.0~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8013%2Fhead;p=ceph.git

rgw: handle error when fetching data log changes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 5024820eb75..437cbc65610 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -936,6 +936,12 @@ public:
 	if (datalog_marker > sync_marker.marker) {
           spawned_keys.clear();
           yield call(new RGWReadRemoteDataLogShardCR(sync_env, shard_id, &sync_marker.marker, &log_entries, &truncated));
+          if (retcode < 0) {
+            ldout(sync_env->cct, 0) << "ERROR: failed to read remote data log info: ret=" << retcode << dendl;
+            lease_cr->go_down();
+            drain_all();
+            return set_cr_error(retcode);
+          }
           for (log_iter = log_entries.begin(); log_iter != log_entries.end(); ++log_iter) {
             ldout(sync_env->cct, 20) << __func__ << ":" << __LINE__ << ": shard_id=" << shard_id << " log_entry: " << log_iter->log_id << ":" << log_iter->log_timestamp << ":" << log_iter->entry.key << dendl;
             if (!marker_tracker->index_key_to_marker(log_iter->entry.key, log_iter->log_id)) {