RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph_test_rados: update for copy_from in begin, not finish

Browse Source 
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-09-27 10:57:46 -07:00
parent c5831fa1b7
commit 37d722093d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/osd/RadosModel.h
View File

@ -1441,6 +1441,8 @@ public:
snap = -1;
}
context->find_object(oid_src, &src_value, snap);
if (!src_value.deleted())
context->update_object_full(oid, src_value);
string src = context->prefix+oid_src;
op.copy_from(src.c_str(), context->io_ctx, src_value.version);
@ -1463,6 +1465,7 @@ public:
librados::SNAP_HEAD,
librados::OPERATION_ORDER_READS_WRITES, // order wrt previous write/update
NULL);
}
void _finish(CallbackInfo *info)
@ -1478,14 +1481,16 @@ public:
assert(comp->is_complete());
cout << num << ": finishing copy_from to " << context->prefix + oid << std::endl;
if ((r = comp->get_return_value())) {
if (!(r == -ENOENT && src_value.deleted())) {
if (r == -ENOENT && src_value.deleted()) {
cout << num << ": got expected ENOENT (src dne)" << std::endl;
} else {
cerr << "Error: oid " << oid << " copy_from " << oid_src << " returned error code "
<< r << std::endl;
assert(0);
}
} else {
assert(!version || comp->get_version64() == version);
version = comp->get_version64();
context->update_object_full(oid, src_value);
context->update_object_version(oid, comp->get_version64());
}
} else if (info->id == 1) {