mirror of
https://github.com/ceph/ceph
synced 2025-02-23 11:07:35 +00:00
Merge pull request #17703 from dzafman/wip-misc
Erasure code read test and code cleanup Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Kefu Chai
GitHub
commit
085778b80a
@ -142,27 +142,67 @@ function rados_put_get() {
|
||||
rm $dir/ORIGINAL
|
||||
}
|
||||
|
||||
function rados_get_data_eio() {
|
||||
function inject_remove() {
|
||||
local pooltype=$1
|
||||
shift
|
||||
local which=$1
|
||||
shift
|
||||
local poolname=$1
|
||||
shift
|
||||
local objname=$1
|
||||
shift
|
||||
local dir=$1
|
||||
shift
|
||||
local shard_id=$1
|
||||
shift
|
||||
local recovery=$1
|
||||
|
||||
local -a initial_osds=($(get_osds $poolname $objname))
|
||||
local osd_id=${initial_osds[$shard_id]}
|
||||
objectstore_tool $dir $osd_id $objname remove || return 1
|
||||
}
|
||||
|
||||
function rados_get_data_recovery() {
|
||||
local inject=$1
|
||||
shift
|
||||
local dir=$1
|
||||
shift
|
||||
local shard_id=$1
|
||||
|
||||
# inject eio to speificied shard
|
||||
#
|
||||
local poolname=pool-jerasure
|
||||
local objname=obj-eio-$$-$shard_id
|
||||
inject_eio ec data $poolname $objname $dir $shard_id || return 1
|
||||
rados_put_get $dir $poolname $objname $recovery || return 1
|
||||
local objname=obj-$inject-$$-$shard_id
|
||||
inject_$inject ec data $poolname $objname $dir $shard_id || return 1
|
||||
rados_put_get $dir $poolname $objname recovery || return 1
|
||||
|
||||
shard_id=$(expr $shard_id + 1)
|
||||
inject_eio ec data $poolname $objname $dir $shard_id || return 1
|
||||
inject_$inject ec data $poolname $objname $dir $shard_id || return 1
|
||||
# Now 2 out of 3 shards get EIO, so should fail
|
||||
rados_get $dir $poolname $objname fail || return 1
|
||||
}
|
||||
|
||||
# Test with an inject error
|
||||
function rados_get_data() {
|
||||
local inject=$1
|
||||
shift
|
||||
local dir=$1
|
||||
shift
|
||||
local shard_id=$1
|
||||
|
||||
# inject eio to speificied shard
|
||||
#
|
||||
local poolname=pool-jerasure
|
||||
local objname=obj-$inject-$$-$shard_id
|
||||
rados_put $dir $poolname $objname || return 1
|
||||
inject_$inject ec data $poolname $objname $dir $shard_id || return 1
|
||||
rados_get $dir $poolname $objname || return 1
|
||||
|
||||
shard_id=$(expr $shard_id + 1)
|
||||
inject_$inject ec data $poolname $objname $dir $shard_id || return 1
|
||||
# Now 2 out of 3 shards get an error, so should fail
|
||||
rados_get $dir $poolname $objname fail || return 1
|
||||
}
|
||||
|
||||
# Change the size of speificied shard
|
||||
#
|
||||
function set_size() {
|
||||
@ -235,7 +275,7 @@ function TEST_rados_get_subread_eio_shard_0() {
|
||||
create_erasure_coded_pool $poolname || return 1
|
||||
# inject eio on primary OSD (0) and replica OSD (1)
|
||||
local shard_id=0
|
||||
rados_get_data_eio $dir $shard_id || return 1
|
||||
rados_get_data eio $dir $shard_id || return 1
|
||||
delete_pool $poolname
|
||||
}
|
||||
|
||||
@ -247,10 +287,26 @@ function TEST_rados_get_subread_eio_shard_1() {
|
||||
create_erasure_coded_pool $poolname || return 1
|
||||
# inject eio into replicas OSD (1) and OSD (2)
|
||||
local shard_id=1
|
||||
rados_get_data_eio $dir $shard_id || return 1
|
||||
rados_get_data eio $dir $shard_id || return 1
|
||||
delete_pool $poolname
|
||||
}
|
||||
|
||||
# We don't remove the object from the primary because
|
||||
# that just causes it to appear to be missing
|
||||
|
||||
function TEST_rados_get_subread_missing() {
|
||||
local dir=$1
|
||||
setup_osds || return 1
|
||||
|
||||
local poolname=pool-jerasure
|
||||
create_erasure_coded_pool $poolname || return 1
|
||||
# inject remove into replicas OSD (1) and OSD (2)
|
||||
local shard_id=1
|
||||
rados_get_data remove $dir $shard_id || return 1
|
||||
delete_pool $poolname
|
||||
}
|
||||
|
||||
#
|
||||
#
|
||||
# These two test cases try to validate that following behavior:
|
||||
# For object on EC pool, if there is one shard which an incorrect
|
||||
@ -296,7 +352,7 @@ function TEST_rados_get_with_subreadall_eio_shard_0() {
|
||||
create_erasure_coded_pool $poolname || return 1
|
||||
# inject eio on primary OSD (0)
|
||||
local shard_id=0
|
||||
rados_get_data_eio $dir $shard_id recovery || return 1
|
||||
rados_get_data_recovery eio $dir $shard_id || return 1
|
||||
|
||||
delete_pool $poolname
|
||||
}
|
||||
@ -311,7 +367,7 @@ function TEST_rados_get_with_subreadall_eio_shard_1() {
|
||||
create_erasure_coded_pool $poolname || return 1
|
||||
# inject eio on replica OSD (1)
|
||||
local shard_id=1
|
||||
rados_get_data_eio $dir $shard_id recovery || return 1
|
||||
rados_get_data_recovery eio $dir $shard_id || return 1
|
||||
|
||||
delete_pool $poolname
|
||||
}
|
||||
|
||||
@ -5341,8 +5341,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
|
||||
map<string, bufferlist> out;
|
||||
result = getattrs_maybe_cache(
|
||||
ctx->obc,
|
||||
&out,
|
||||
true);
|
||||
&out);
|
||||
|
||||
bufferlist bl;
|
||||
::encode(out, bl);
|
||||
@ -6113,8 +6112,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
|
||||
/* rm_attrs */
|
||||
map<string,bufferlist> rmattrs;
|
||||
result = getattrs_maybe_cache(ctx->obc,
|
||||
&rmattrs,
|
||||
true);
|
||||
&rmattrs);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
@ -7770,8 +7768,7 @@ int PrimaryLogPG::do_copy_get(OpContext *ctx, bufferlist::iterator& bp,
|
||||
if (!cursor.attr_complete) {
|
||||
result = getattrs_maybe_cache(
|
||||
ctx->obc,
|
||||
&out_attrs,
|
||||
true);
|
||||
&out_attrs);
|
||||
if (result < 0) {
|
||||
if (cb) {
|
||||
delete cb;
|
||||
@ -14415,26 +14412,23 @@ int PrimaryLogPG::getattr_maybe_cache(
|
||||
|
||||
int PrimaryLogPG::getattrs_maybe_cache(
|
||||
ObjectContextRef obc,
|
||||
map<string, bufferlist> *out,
|
||||
bool user_only)
|
||||
map<string, bufferlist> *out)
|
||||
{
|
||||
int r = 0;
|
||||
assert(out);
|
||||
if (pool.info.require_rollback()) {
|
||||
if (out)
|
||||
*out = obc->attr_cache;
|
||||
*out = obc->attr_cache;
|
||||
} else {
|
||||
r = pgbackend->objects_get_attrs(obc->obs.oi.soid, out);
|
||||
}
|
||||
if (out && user_only) {
|
||||
map<string, bufferlist> tmp;
|
||||
for (map<string, bufferlist>::iterator i = out->begin();
|
||||
i != out->end();
|
||||
++i) {
|
||||
if (i->first.size() > 1 && i->first[0] == '_')
|
||||
tmp[i->first.substr(1, i->first.size())].claim(i->second);
|
||||
}
|
||||
tmp.swap(*out);
|
||||
map<string, bufferlist> tmp;
|
||||
for (map<string, bufferlist>::iterator i = out->begin();
|
||||
i != out->end();
|
||||
++i) {
|
||||
if (i->first.size() > 1 && i->first[0] == '_')
|
||||
tmp[i->first.substr(1, i->first.size())].claim(i->second);
|
||||
}
|
||||
tmp.swap(*out);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
@ -1799,8 +1799,7 @@ public:
|
||||
bufferlist *val);
|
||||
int getattrs_maybe_cache(
|
||||
ObjectContextRef obc,
|
||||
map<string, bufferlist> *out,
|
||||
bool user_only = false);
|
||||
map<string, bufferlist> *out);
|
||||
};
|
||||
|
||||
inline ostream& operator<<(ostream& out, const PrimaryLogPG::RepGather& repop)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user