From 389020e14594e4894e28d1eb9103c210b142509e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:13 +0200 Subject: Adding upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/pybind/mgr/pg_autoscaler/module.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/pybind/mgr/pg_autoscaler/module.py') diff --git a/src/pybind/mgr/pg_autoscaler/module.py b/src/pybind/mgr/pg_autoscaler/module.py index ea7c4b00b..0ab263877 100644 --- a/src/pybind/mgr/pg_autoscaler/module.py +++ b/src/pybind/mgr/pg_autoscaler/module.py @@ -260,6 +260,13 @@ class PgAutoscaler(MgrModule): else: return False + def has_norecover_flag(self) -> bool: + flags = self.get_osdmap().dump().get('flags', '') + if 'norecover' in flags: + return True + else: + return False + @CLIWriteCommand("osd pool get noautoscale") def get_noautoscale(self) -> Tuple[int, str, str]: """ @@ -321,7 +328,7 @@ class PgAutoscaler(MgrModule): def serve(self) -> None: self.config_notify() while not self._shutdown.is_set(): - if not self.has_noautoscale_flag(): + if not self.has_noautoscale_flag() and not self.has_norecover_flag(): osdmap = self.get_osdmap() pools = osdmap.get_pools_by_name() self._maybe_adjust(osdmap, pools) -- cgit v1.2.3