pglog: require users set a config option before ignoring divergent_priors

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 789e04107643b82ce781858a4189eb856929592c..c2cd2e1c4dee5a7922d3645dd6c2e56662b90125 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -239,6 +239,7 @@ OPTION(mon_osd_allow_primary_affinity, OPT_BOOL, false)  // allow primary_affini
 OPTION(mon_osd_prime_pg_temp, OPT_BOOL, true)  // prime osdmap with pg mapping changes
 OPTION(mon_osd_prime_pg_temp_max_time, OPT_FLOAT, .5)  // max time to spend priming
 OPTION(mon_osd_pool_ec_fast_read, OPT_BOOL, false) // whether turn on fast read on the pool or not
+OPTION(osd_ignore_stale_divergent_priors, OPT_BOOL, false) // do not assert on divergent_prior entries which aren't in the log and whose on-disk objects are newer
 OPTION(mon_stat_smooth_intervals, OPT_INT, 2)  // smooth stats over last N PGMap maps
 OPTION(mon_election_timeout, OPT_FLOAT, 5)  // on election proposer, max waiting time for all ACKs
 OPTION(mon_lease, OPT_FLOAT, 5)       // lease interval

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 27a77e3f72708074098aafa5a84417d7ca0b0496..c2ca1741fb8ca1d19d7f0f11f8d2ef620d2092c2 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3154,7 +3154,7 @@ void PG::read_state(ObjectStore *store, bufferlist &bl)
                  coll,
                  info_struct_v < 8 ? coll_t::meta() : coll,
                  ghobject_t(info_struct_v < 8 ? OSD::make_pg_log_oid(pg_id) : pgmeta_oid),
-                 info, oss);
+                 info, oss, cct->_conf->osd_ignore_stale_divergent_priors);
   if (oss.tellp())
     osd->clog->error() << oss.rdbuf();
 

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index bdb8c80b1fcd6b2620c4a2951ffecd0e7c215e79..da5bf191954a4b9849d924ecfd909ef1666d7f05 100644 (file)
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -932,8 +932,10 @@ void PGLog::read_log(ObjectStore *store, coll_t pg_coll,
                     IndexedLog &log,
                     pg_missing_t &missing,
                     ostringstream &oss,
+                    bool tolerate_divergent_missing_log,
                     const DoutPrefixProvider *dpp,
                     set<string> *log_keys_debug)
+                  
 {
   ldpp_dout(dpp, 20) << "read_log coll " << pg_coll
                     << " log_oid " << log_oid << dendl;
@@ -1051,9 +1053,9 @@ void PGLog::read_log(ObjectStore *store, coll_t pg_coll,
         * Unfortunately the assessment above is incorrect because of
         * http://tracker.ceph.com/issues/17916 (we were incorrectly
         * not removing the divergent_priors set from disk state!),
-        * so let's check that.
+        * so let's check that if the user asked us to.
         */
-       if (oi.version > i->first) {
+       if (oi.version > i->first && tolerate_divergent_missing_log) {
          ldpp_dout(dpp, 0) << "read_log divergent_priors entry (" << *i
                            << ") inconsistent with disk state (" <<  oi
                            << "), assuming it is tracker.ceph.com/issues/17916"

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 0083303bb7275d32f34b1d76d5f60ec0a4691fb6..e8109f4815dc1bc5824b5ca554e29e57fcc367dc 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -833,10 +833,11 @@ public:
 
   void read_log(ObjectStore *store, coll_t pg_coll,
                coll_t log_coll, ghobject_t log_oid,
-               const pg_info_t &info, ostringstream &oss) {
+               const pg_info_t &info, ostringstream &oss,
+               bool tolerate_divergent_missing_log) {
     return read_log(
       store, pg_coll, log_coll, log_oid, info, divergent_priors,
-      log, missing, oss,
+      log, missing, oss, tolerate_divergent_missing_log,
       this,
       (pg_log_debug ? &log_keys_debug : 0));
   }
@@ -846,6 +847,7 @@ public:
     const pg_info_t &info, map<eversion_t, hobject_t> &divergent_priors,
     IndexedLog &log,
     pg_missing_t &missing, ostringstream &oss,
+    bool tolerate_divergent_missing_log,
     const DoutPrefixProvider *dpp = NULL,
     set<string> *log_keys_debug = 0
     );

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index f3714a655499d118d6e91c2e010b2030d9e3c6f9..6d3ba3f6e58905190291165a6a6b8dd00948671e 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -356,7 +356,9 @@ int get_log(ObjectStore *fs, __u8 struct_ver,
     PGLog::read_log(fs, coll,
                    struct_ver >= 8 ? coll : coll_t::meta(),
                    struct_ver >= 8 ? pgid.make_pgmeta_oid() : log_oid,
-                   info, divergent_priors, log, missing, oss);
+                   info, divergent_priors, log,
+                   missing, oss,
+                   g_ceph_context->_conf->osd_ignore_stale_divergent_priors);
     if (debug && oss.str().size())
       cerr << oss.str() << std::endl;
   }