RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49261 from ajarr/fix-57726

Browse Source 
mgr/rbd_support: remove localized schedule option during module startup

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2022-12-26 14:56:05 +01:00 committed by GitHub
commit 57f9aba4c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
View File

@ -369,15 +369,13 @@ class MirrorSnapshotScheduleHandler:
self.queue: Dict[str, List[ImageSpec]] = {}
# pool_id => {namespace => image_id}
self.images: Dict[str, Dict[str, Dict[str, str]]] = {}
self.schedules = Schedules(self)
self.refresh_images()
self.log.debug("MirrorSnapshotScheduleHandler: queue is initialized")
def load_schedules(self) -> None:
self.log.info("MirrorSnapshotScheduleHandler: load_schedules")
schedules = Schedules(self)
schedules.load(namespace_validator, image_validator)
self.schedules = schedules
self.schedules.load(namespace_validator, image_validator)
def refresh_images(self) -> float:
elapsed = (datetime.now() - self.last_refresh_images).total_seconds()

23
src/pybind/mgr/rbd_support/schedule.py
View File

@ -378,18 +378,10 @@ class Schedules:
self.level_specs: Dict[str, LevelSpec] = {}
self.schedules: Dict[str, Schedule] = {}
def __len__(self) -> int:
return len(self.schedules)
def load(self,
namespace_validator: Optional[Callable] = None,
image_validator: Optional[Callable] = None) -> None:
schedule_cfg = self.handler.module.get_module_option(
self.handler.MODULE_OPTION_NAME, '')
# Previous versions incorrectly stored the global config in
# the localized module option. Check the config is here and fix it.
schedule_cfg = self.handler.module.get_module_option(
self.handler.MODULE_OPTION_NAME, '')
if not schedule_cfg:
schedule_cfg = self.handler.module.get_localized_module_option(
self.handler.MODULE_OPTION_NAME, '')
@ -399,6 +391,17 @@ class Schedules:
self.handler.module.set_localized_module_option(
self.handler.MODULE_OPTION_NAME, None)
def __len__(self) -> int:
return len(self.schedules)
def load(self,
namespace_validator: Optional[Callable] = None,
image_validator: Optional[Callable] = None) -> None:
self.level_specs = {}
self.schedules = {}
schedule_cfg = self.handler.module.get_module_option(
self.handler.MODULE_OPTION_NAME, '')
if schedule_cfg:
try:
level_spec = LevelSpec.make_global()

6
src/pybind/mgr/rbd_support/trash_purge_schedule.py
View File

@ -62,15 +62,13 @@ class TrashPurgeScheduleHandler:
self.queue: Dict[str, List[Tuple[str, str]]] = {}
# pool_id => {namespace => pool_name}
self.pools: Dict[str, Dict[str, str]] = {}
self.schedules = Schedules(self)
self.refresh_pools()
self.log.debug("TrashPurgeScheduleHandler: queue is initialized")
def load_schedules(self) -> None:
self.log.info("TrashPurgeScheduleHandler: load_schedules")
schedules = Schedules(self)
schedules.load()
self.schedules = schedules
self.schedules.load()
def refresh_pools(self) -> float:
elapsed = (datetime.now() - self.last_refresh_pools).total_seconds()