From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 14 Sep 2021 16:39:28 +0000 (+0000)
Subject: crush, crimson: don't support crush_location_hook as crimson lacks SubProcess.
X-Git-Tag: v17.1.0~724^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b17fa025d088c3664d6de00bf7acbdd611ee56d;p=ceph.git

crush, crimson: don't support crush_location_hook as crimson lacks SubProcess.

See: https://gist.github.com/rzarzynski/7827e23f162e5f0ad9b2955e938918c7.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc
index fa475fa53e7c..12a62064f1d2 100644
--- a/src/crush/CrushLocation.cc
+++ b/src/crush/CrushLocation.cc
@@ -5,7 +5,9 @@
 
 #include "CrushLocation.h"
 #include "CrushWrapper.h"
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
 #include "common/SubProcess.h"
+#endif
 #include "common/ceph_context.h"
 #include "common/config.h"
 #include "common/debug.h"
@@ -46,6 +48,9 @@ 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;
@@ -93,6 +98,7 @@ 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()