From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Aug 2019 21:56:07 +0000 (-0500)
Subject: os/bluestore: fsck: warning (not error) by default on no per-pool omap
X-Git-Tag: v15.1.0~1915^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c690ae285d623d02b084838312833075cf5b2a3;p=ceph.git

os/bluestore: fsck: warning (not error) by default on no per-pool omap

Unconditionally error if the global per_pool_omap was set, though!

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

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index df13b12c80f5..be221c659367 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1071,6 +1071,7 @@ OPTION(bluestore_debug_inject_csum_err_probability, OPT_FLOAT)
 OPTION(bluestore_no_per_pool_stats_tolerance, OPT_STR)
 OPTION(bluestore_warn_on_bluefs_spillover, OPT_BOOL)
 OPTION(bluestore_warn_on_legacy_statfs, OPT_BOOL)
+OPTION(bluestore_fsck_error_on_no_per_pool_omap, OPT_BOOL)
 OPTION(bluestore_log_op_age, OPT_DOUBLE)
 OPTION(bluestore_log_omap_iterator_age, OPT_DOUBLE)
 OPTION(bluestore_log_collection_list_age, OPT_DOUBLE)
diff --git a/src/common/options.cc b/src/common/options.cc
index c6095a45922b..7f107a4beb55 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4864,6 +4864,10 @@ std::vector<Option> get_global_options() {
     .set_default(true)
     .set_description("Enable health indication on lack of per-pool statfs reporting from bluestore"),
 
+    Option("bluestore_fsck_error_on_no_per_pool_omap", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(false)
+    .set_description("Make fsck error (instead of warn) when objects without per-pool omap are found"),
+
     Option("bluestore_log_op_age", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(5)
     .set_description("log operation if it's slower than this age (seconds)"),
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index f88bb7b49ce4..9dad291300d6 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7014,6 +7014,7 @@ int BlueStore::_fsck(bool deep, bool repair)
 	  << (repair ? " repair" : " check")
 	  << (deep ? " (deep)" : " (shallow)") << " start" << dendl;
   int64_t errors = 0;
+  int64_t warnings = 0;
   unsigned repaired = 0;
 
   typedef btree::btree_set<
@@ -7165,8 +7166,16 @@ int BlueStore::_fsck(bool deep, bool repair)
   }
 
   if (!per_pool_omap) {
-    derr << "fsck error: store not yet converted to per-pool omap" << dendl;
-    ++errors;
+    const char *w;
+    if (cct->_conf->bluestore_fsck_error_on_no_per_pool_omap) {
+      w = "error";
+      ++errors;
+    } else {
+      w = "warning";
+      ++warnings;
+    }
+    derr << "fsck " << w << ": store not yet converted to per-pool omap"
+	 << dendl;
     if (repair) {
       repairer.fix_per_pool_omap(db);
     }
@@ -7501,11 +7510,23 @@ int BlueStore::_fsck(bool deep, bool repair)
 	} else {
 	  m.insert(o->onode.nid);
 	}
-	if (per_pool_omap &&
-	    (!o->onode.is_perpool_omap() && !o->onode.is_pgmeta_omap())) {
-	  derr << "fsck error: " << oid << " has omap that is not per-pool or pgmeta"
-	       << dendl;
-	  ++errors;
+	if (!o->onode.is_perpool_omap() && !o->onode.is_pgmeta_omap()) {
+	  if (per_pool_omap) {
+	    derr << "fsck error: " << oid
+		 << " has omap that is not per-pool or pgmeta" << dendl;
+	    ++errors;
+	  } else {
+	    const char *w;
+	    if (cct->_conf->bluestore_fsck_error_on_no_per_pool_omap) {
+	      ++errors;
+	      w = "error";
+	    } else {
+	      ++warnings;
+	      w = "warning";
+	    }
+	    derr << "fsck " << w << ": " << oid
+		 << " has omap that is not per-pool or pgmeta" << dendl;
+	  }
 	}
 	if (repair &&
 	    o->onode.has_omap() &&
@@ -8079,8 +8100,10 @@ int BlueStore::_fsck(bool deep, bool repair)
 	  << dendl;
 
   utime_t duration = ceph_clock_now() - start;
-  dout(1) << __func__ << " <<<FINISH>>> with " << errors << " errors, " << repaired
-	  << " repaired, " << (errors - (int)repaired) << " remaining in "
+  dout(1) << __func__ << " <<<FINISH>>> with " << errors << " errors, "
+	  << warnings << " warnings, "
+	  << repaired << " repaired, "
+	  << (errors + warnings - (int)repaired) << " remaining in "
 	  << duration << " seconds" << dendl;
   return errors - (int)repaired;
 }