From: David Zafman Date: Thu, 6 Aug 2015 23:15:05 +0000 (-0700) Subject: common, osd: Remove osd_read_eio_on_bad_digest config variable X-Git-Tag: v9.1.0~244^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=450149213eec90b01103b47e35b9784a3ef92ab3;p=ceph.git common, osd: Remove osd_read_eio_on_bad_digest config variable In order to handle erasure coded reads where additional chunks would be able to substitute for some bad chunks, we really need to return an indication of bad digests or incorrectly sized chunks. We are simply using the error return of -EIO to convey that information for future use. Signed-off-by: David Zafman --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 81d3291f9fc8..811f66e47759 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -607,8 +607,6 @@ OPTION(osd_recover_clone_overlap, OPT_BOOL, true) // preserve clone_overlap du OPTION(osd_op_num_threads_per_shard, OPT_INT, 2) OPTION(osd_op_num_shards, OPT_INT, 5) -OPTION(osd_read_eio_on_bad_digest, OPT_BOOL, true) // return EIO if object digest is bad - // Only use clone_overlap for recovery if there are fewer than // osd_recover_clone_overlap_limit entries in the overlap set OPTION(osd_recover_clone_overlap_limit, OPT_INT, 10) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index f4991fdfafce..16e24c44642a 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3844,8 +3844,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) << " != expected 0x" << oi.data_digest << std::dec << " on " << soid; // FIXME fall back to replica or something? - if (g_conf->osd_read_eio_on_bad_digest) - result = -EIO; + result = -EIO; } } }