RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15938 from shashalu/fix-data-sync-run

Browse Source 
rgw: fix radosgw-admin data sync run crash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Yuri Weinstein 2017-07-06 08:44:12 -07:00 committed by GitHub
commit 5dea731aee
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rgw/rgw_data_sync.cc
View File

@ -1463,9 +1463,7 @@ public:
data_sync_module = sync_env->sync_module->get_data_handler();
if (retcode == -ENOENT) {
sync_status.sync_info.num_shards = num_shards;
} else if (retcode < 0 && retcode != -ENOENT) {
if (retcode < 0 && retcode != -ENOENT) {
ldout(sync_env->cct, 0) << "ERROR: failed to fetch sync status, retcode=" << retcode << dendl;
return set_cr_error(retcode);
}
@ -1473,6 +1471,7 @@ public:
/* state: init status */
if ((rgw_data_sync_info::SyncState)sync_status.sync_info.state == rgw_data_sync_info::StateInit) {
ldout(sync_env->cct, 20) << __func__ << "(): init" << dendl;
sync_status.sync_info.num_shards = num_shards;
uint64_t instance_id;
get_random_bytes((char *)&instance_id, sizeof(instance_id));
yield call(new RGWInitDataSyncStatusCoroutine(sync_env, num_shards, instance_id, &sync_status));