]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crush/CrushLocation: remove useless flag
authorluo rixin <luorixin@huawei.com>
Mon, 10 Jul 2023 03:56:12 +0000 (11:56 +0800)
committerluo rixin <luorixin@huawei.com>
Mon, 10 Jul 2023 06:21:32 +0000 (14:21 +0800)
In pr 'https://github.com/ceph/ceph/pull/51352', we have
crimson/crush/CrushLocation.cc, there is no need crimson
releated code in crush/CrushLocation.cc, so just remove.

Signed-off-by: luo rixin <luorixin@huawei.com>
src/crush/CrushLocation.cc

index eccffc8fed5a6bcacb0170990bdc1d243c1b9b7e..fb2ada8d6d27768dfa216e30065d628124986c4c 100644 (file)
@@ -45,9 +45,6 @@ int CrushLocation::update_from_hook()
   if (cct->_conf->crush_location_hook.length() == 0)
     return 0;
  
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
-  ceph_abort_msg("crimson does not support crush_location_hook, it must stay empty");
-#else
   if (0 != access(cct->_conf->crush_location_hook.c_str(), R_OK)) {
     lderr(cct) << "the user define crush location hook: " << cct->_conf->crush_location_hook
                << " may not exist or can not access it" << dendl;
@@ -95,7 +92,6 @@ int CrushLocation::update_from_hook()
   bl.begin().copy(bl.length(), out);
   out.erase(out.find_last_not_of(" \n\r\t")+1);
   return _parse(out);
-#endif // WITH_SEASTAR && !WITH_ALIEN
 }
 
 int CrushLocation::init_on_startup()