From: Sage Weil <sage@redhat.com>
Date: Thu, 25 May 2017 19:29:20 +0000 (-0400)
Subject: osd: remove osd_enxio_on_misdirected_op option
X-Git-Tag: v12.1.0~57^2~17^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c150cba817a36a2fef9d63a34cd67867992d066d;p=ceph.git

osd: remove osd_enxio_on_misdirected_op option

There is no good reason anyone would want this turned on.

Introduced 923e7f5ce5ed437af15e178299a61029ff48e4a2 (post-kraken), but
backported to kraken and jewel (10.2.6).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 122e84401fe8..3053625578c7 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -887,7 +887,6 @@ OPTION(osd_debug_reject_backfill_probability, OPT_DOUBLE, 0)
 OPTION(osd_debug_inject_copyfrom_error, OPT_BOOL, false)  // inject failure during copyfrom completion
 OPTION(osd_debug_misdirected_ops, OPT_BOOL, false)
 OPTION(osd_debug_skip_full_check_in_recovery, OPT_BOOL, false)
-OPTION(osd_enxio_on_misdirected_op, OPT_BOOL, false)
 OPTION(osd_debug_verify_cached_snaps, OPT_BOOL, false)
 OPTION(osd_enable_op_tracker, OPT_BOOL, true) // enable/disable OSD op tracking
 OPTION(osd_num_op_tracker_shard, OPT_U32, 32) // The number of shards for holding the ops
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 87177a3d7596..413e15da1c70 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1575,9 +1575,6 @@ void OSDService::handle_misdirected_op(PG *pg, OpRequestRef op)
 	       << " to osd." << whoami
 	       << " not " << pg->acting
 	       << " in e" << m->get_map_epoch() << "/" << osdmap->get_epoch();
-  if (g_conf->osd_enxio_on_misdirected_op) {
-    reply_op_error(op, -ENXIO);
-  }
 }
 
 void OSDService::enqueue_back(spg_t pgid, PGQueueable qi)