RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 13:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47965 from cbodley/wip-rgw-drain-cb-capture-error

Browse Source 
Revert "rgw: add coroutine drain callback capture_error()"

Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
This commit is contained in:
Casey Bodley 2022-09-16 10:02:14 -04:00 committed by GitHub
commit e59d743b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/rgw/rgw_data_sync.cc
View File

@ -53,16 +53,6 @@ static const string bucket_full_status_oid_prefix = "bucket.full-sync-status";
static const string bucket_status_oid_prefix = "bucket.sync-status";
static const string object_status_oid_prefix = "bucket.sync-status";
// returns a lambda that captures negative error codes into the given int&
static auto capture_error(int& retcode) {
return [&retcode] (uint64_t stack_id, int ret) {
if (ret < 0) {
retcode = ret;
}
return ret;
};
}
void rgw_datalog_info::decode_json(JSONObj *obj) {
JSONDecoder::decode_json("num_objects", num_shards, obj);
}
@ -1471,16 +1461,20 @@ public:
yield_spawn_window(rgw::error_repo::write_cr(sync_env->store->svc()->rados, error_repo,
rgw::error_repo::encode_key(bs, each->gen),
timestamp), cct->_conf->rgw_data_sync_spawn_window,
capture_error(retcode));
if (retcode < 0) {
return set_cr_error(retcode);
}
[&](uint64_t stack_id, int ret) {
if (ret < 0) {
retcode = ret;
}
return 0;
});
}
}
drain_all_cb(capture_error(retcode));
if (retcode < 0) {
return set_cr_error(retcode);
}
drain_all_cb([&](uint64_t stack_id, int ret) {
if (ret < 0) {
tn->log(10, SSTR("writing to error repo returned error: " << ret));
}
return ret;
});
// once everything succeeds, remove the full sync obligation from the error repo
yield call(rgw::error_repo::remove_cr(sync_env->store->svc()->rados, error_repo,
@ -1602,11 +1596,21 @@ public:
first_shard = false;
} else {
yield_spawn_window(shard_cr, cct->_conf->rgw_data_sync_spawn_window,
capture_error(retcode));
[&](uint64_t stack_id, int ret) {
if (ret < 0) {
retcode = ret;
}
return retcode;
});
}
}
}
drain_all_cb(capture_error(retcode));
drain_all_cb([&](uint64_t stack_id, int ret) {
if (ret < 0) {
retcode = ret;
}
return retcode;
});
}
yield call(marker_tracker->finish(key));
@ -4353,14 +4357,25 @@ int RGWBucketFullSyncCR::operate(const DoutPrefixProvider *dpp)
false);
}
drain_with_cb(cct->_conf->rgw_bucket_sync_spawn_window,
capture_error(sync_result));
[&](uint64_t stack_id, int ret) {
if (ret < 0) {
tn->log(10, "a sync operation returned error");
sync_result = ret;
}
return 0;
});
}
} while (list_result.is_truncated && sync_result == 0);
set_status("done iterating over all objects");
/* wait for all operations to complete */
drain_all_cb(capture_error(sync_result));
drain_all_cb([&](uint64_t stack_id, int ret) {
if (ret < 0) {
tn->log(10, "a sync operation returned error");
sync_result = ret;
}
return 0;
});
tn->unset_flag(RGW_SNS_FLAG_ACTIVE);
if (lease_cr && !lease_cr->is_locked()) {
tn->log(1, "no lease or lease is lost, abort");
@ -4736,12 +4751,24 @@ int RGWBucketShardIncrementalSyncCR::operate(const DoutPrefixProvider *dpp)
}
// }
drain_with_cb(cct->_conf->rgw_bucket_sync_spawn_window,
capture_error(sync_status));
[&](uint64_t stack_id, int ret) {
if (ret < 0) {
tn->log(10, "a sync operation returned error");
sync_status = ret;
}
return 0;
});
}
} while (!list_result.empty() && sync_status == 0 && !syncstopped);
drain_all_cb(capture_error(sync_status));
drain_all_cb([&](uint64_t stack_id, int ret) {
if (ret < 0) {
tn->log(10, "a sync operation returned error");
sync_status = ret;
}
return 0;
});
tn->unset_flag(RGW_SNS_FLAG_ACTIVE);
if (syncstopped) {