osd: add option to disable startup check

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index c2a577fa31d9a638b396d052ae77a06ef03742c9..a589f1e627d573b50164a21e2f7590bba3133447 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -556,6 +556,9 @@ OPTION(mds_max_scrub_ops_in_progress, OPT_INT, 5) // the number of simultaneous
 // Maximum number of damaged frags/dentries before whole MDS rank goes damaged
 OPTION(mds_damage_table_max_entries, OPT_INT, 10000)
 
+// verify backend can support configured max object name length
+OPTION(osd_check_max_object_name_len_on_sthartup, OPT_BOOL, true)
+
 // If true, compact leveldb store on mount
 OPTION(osd_compact_leveldb_on_mount, OPT_BOOL, false)
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b37134114e34e6db45da9239a611c17dfd6d590b..a174aa09aa98af2e392190a5d4df312dbac0ebf5 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2037,7 +2037,13 @@ int OSD::init()
       derr << "   osd max object namespace len = "
           << g_conf->osd_max_object_namespace_len << dendl;
       derr << cpp_strerror(r) << dendl;
-      goto out;
+      if (g_conf->osd_check_max_object_name_len_on_startup) {
+       goto out;
+      }
+      derr << "osd_check_max_object_name_len_on_startup = false, starting anyway"
+          << dendl;
+    } else {
+      dout(20) << "configured osd_max_object_name[space]_len looks ok" << dendl;
     }
   }