osd: remove warning about max object name length

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 255bd5d45dc0d4eead4dc57a64d7211de7eeadb5..b44b365ce4061b59b95691cc0380f00bcb2fa62b 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -142,23 +142,6 @@ create_object_store(const std::string &dev, const std::string &jdev)
 #undef dout_prefix
 #define dout_prefix *_dout
 
-/* Complain about flaky object stores.
- */
-void OSD::validate_max_object_name_length(ObjectStore *store)
-{
-  int len = store->get_max_object_name_length();
-  if (len <= 0) {
-    derr << "store->get_max_object_name_length failed with error " << len << dendl;
-    return;
-  }
-  else if (len < MAX_CEPH_OBJECT_NAME_LEN) {
-    derr << TEXT_RED << " ** ERROR: error: object store can only handle objects "
-         << "whose names are no more than " << len << " bytes.\n"
-        << "** Please use an object store that can handle object names of at least "
-        << MAX_CEPH_OBJECT_NAME_LEN << " bytes for safety." << TEXT_NORMAL << dendl;
-  }
-}
-
 int OSD::mkfs(const std::string &dev, const std::string &jdev, ceph_fsid_t fsid, int whoami)
 {
   int ret;
@@ -183,8 +166,6 @@ int OSD::mkfs(const std::string &dev, const std::string &jdev, ceph_fsid_t fsid,
       derr << "OSD::mkfs: couldn't mount FileStore: error " << ret << dendl;
       goto free_store;
     }
-    validate_max_object_name_length(store);
-
     ret = write_meta(dev, fsid, whoami);
     if (ret) {
       derr << "OSD::mkfs: failed to write fsid file: error " << ret << dendl;
@@ -552,8 +533,6 @@ int OSD::init()
     return r;
   }
 
-  validate_max_object_name_length(store);
-
   dout(2) << "boot" << dendl;
 
   // read superblock

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index cb846cc9e1fc4b4386ed16349f16e199347e0257..748ccab71a46a1be9f17904a38d244b71286b66a 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1048,7 +1048,6 @@ protected:
   // static bits
   static int find_osd_dev(char *result, int whoami);
   static ObjectStore *create_object_store(const std::string &dev, const std::string &jdev);
-  static void validate_max_object_name_length(ObjectStore *store);
   static int mkfs(const std::string &dev, const std::string &jdev,
                  ceph_fsid_t fsid, int whoami);
   static int mkjournal(const std::string &dev, const std::string &jdev);