]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Execute crush_location_hook when configured in ceph.conf 15951/head
authorWido den Hollander <wido@42on.com>
Tue, 27 Jun 2017 14:17:58 +0000 (16:17 +0200)
committerWido den Hollander <wido@42on.com>
Tue, 27 Jun 2017 14:17:58 +0000 (16:17 +0200)
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>
src/crush/CrushLocation.h

index b3241eff36cbf49299e94d7811b06594e25c6871..bba737ecac9edbc9e899efdb5fcd06ea47fda2db 100644 (file)
@@ -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