From: Wido den Hollander <wido@42on.com>
Date: Tue, 27 Jun 2017 14:17:58 +0000 (+0200)
Subject: osd: Execute crush_location_hook when configured in ceph.conf
X-Git-Tag: ses5-milestone8~1^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be7aecc9564c4e39458e29ad3fd6d0d55eb61b6b;p=ceph.git

osd: Execute crush_location_hook when configured in ceph.conf

CrushLocation only invoked update_from_conf() which meant that
update_from_hook() was never executed.

By called init_on_startup() both functions are executed so that
the hook is called when configured.

Signed-off-by: Wido den Hollander <wido@42on.com>
---

diff --git a/src/crush/CrushLocation.h b/src/crush/CrushLocation.h
index b3241eff36cb..bba737ecac9e 100644
--- a/src/crush/CrushLocation.h
+++ b/src/crush/CrushLocation.h
@@ -19,7 +19,7 @@ class CrushLocation {
 
 public:
   CrushLocation(CephContext *c) : cct(c) {
-    update_from_conf();
+    init_on_startup();
   }
 
   int update_from_conf();  ///< refresh from config