]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #23634 from cbodley/wip-21154
authorCasey Bodley <cbodley@users.noreply.github.com>
Fri, 7 Sep 2018 15:05:20 +0000 (11:05 -0400)
committerGitHub <noreply@github.com>
Fri, 7 Sep 2018 15:05:20 +0000 (11:05 -0400)
rgw: RGWRadosGetOmapKeysCR takes result by shared_ptr

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_cr_rados.cc
src/rgw/rgw_cr_rados.h
src/rgw/rgw_data_sync.cc
src/rgw/rgw_sync.cc

Simple merge
Simple merge
index e8954f6fe1889ef953475c6bfc37a03deec6e13c,361a0de50e1eedc3ea868af3009467a25d6facfa..7d841c19641b19802288304a45cd6ab856f7b32b
@@@ -1429,14 -1449,12 +1435,15 @@@ public
            error_retry_time = ceph::real_clock::now() + make_timespan(retry_backoff_secs);
            error_marker.clear();
          }
+         omapkeys.reset();
  
  
 -        yield call(new RGWReadRemoteDataLogShardInfoCR(sync_env, shard_id, &shard_info));
 +#define INCREMENTAL_MAX_ENTRIES 100
 +        tn->log(20, SSTR("shard_id=" << shard_id << " sync_marker=" << sync_marker.marker));
 +        spawned_keys.clear();
 +        yield call(new RGWReadRemoteDataLogShardCR(sync_env, shard_id, &sync_marker.marker, &log_entries, &truncated));
          if (retcode < 0) {
 -          tn->log(0, SSTR("ERROR: failed to fetch remote data log info: ret=" << retcode));
 +          tn->log(0, SSTR("ERROR: failed to read remote data log info: ret=" << retcode));
            stop_spawned_services();
            drain_all();
            return set_cr_error(retcode);
Simple merge