]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rbd_support: store global schedule without localized prefix
authorMykola Golub <mgolub@suse.com>
Tue, 27 Oct 2020 18:00:52 +0000 (18:00 +0000)
committerNathan Cutler <ncutler@suse.com>
Mon, 30 Nov 2020 11:56:41 +0000 (12:56 +0100)
so it is still used after mgr failover

Fixes: https://tracker.ceph.com/issues/48020
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit e46e80474f07af2b9324f9ec0e893ba6b5e72033)

src/pybind/mgr/rbd_support/schedule.py

index 795f8f5fe2b0d6e7f5b184b00855713b08aa3f88..d07b028259218ebf7e680d2ffa978ed18d037436 100644 (file)
@@ -343,7 +343,7 @@ class Schedules:
 
     def load(self, namespace_validator=None, image_validator=None):
 
-        schedule_cfg = self.handler.module.get_localized_module_option(
+        schedule_cfg = self.handler.module.get_module_option(
             self.handler.MODULE_OPTION_NAME, '')
         if schedule_cfg:
             try:
@@ -420,8 +420,8 @@ class Schedules:
 
     def save(self, level_spec, schedule):
         if level_spec.is_global():
-            schedule_cfg = schedule and schedule.to_json() or ''
-            self.handler.module.set_localized_module_option(
+            schedule_cfg = schedule and schedule.to_json() or None
+            self.handler.module.set_module_option(
                 self.handler.MODULE_OPTION_NAME, schedule_cfg)
             return