diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/pybind/mgr/pg_autoscaler/module.py | |
parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/pybind/mgr/pg_autoscaler/module.py')
-rw-r--r-- | src/pybind/mgr/pg_autoscaler/module.py | 9 |
1 files changed, 8 insertions, 1 deletions
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) |