RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42741 from sosodev/master

Browse Source 
mgr/pg_autoscaler: add threshold module option
This commit is contained in:
Kamoltat Sirivadhna 2021-08-26 13:13:02 -04:00 committed by GitHub
commit aeca18d479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/rados/operations/placement-groups.rst
View File

@ -88,7 +88,10 @@ number of PGs that the pool is working towards, if a ``pg_num``
change is in progress). **NEW PG_NUM**, if present, is what the change is in progress). **NEW PG_NUM**, if present, is what the
system believes the pool's ``pg_num`` should be changed to. It is system believes the pool's ``pg_num`` should be changed to. It is
always a power of 2, and will only be present if the "ideal" value always a power of 2, and will only be present if the "ideal" value
varies from the current value by more than a factor of 3. varies from the current value by more than a factor of 3 by default.
This factor can be be adjusted with::
ceph osd pool set threshold 2.0
**AUTOSCALE**, is the pool ``pg_autoscale_mode`` **AUTOSCALE**, is the pool ``pg_autoscale_mode``
and will be either ``on``, ``off``, or ``warn``. and will be either ``on``, ``off``, or ``warn``.

24
src/pybind/mgr/pg_autoscaler/module.py
View File

@ -137,6 +137,14 @@ class PgAutoscaler(MgrModule):
'means starts out with full pgs and scales down when ' 'means starts out with full pgs and scales down when '
'there is pressure '), 'there is pressure '),
runtime=True), runtime=True),
Option(
name='threshold',
type='float',
desc='scaling threshold',
long_desc=('The factor by which the `NEW PG_NUM` must vary from the current'
'`PG_NUM` before being accepted. Cannot be less than 1.0'),
default=3.0,
min=1.0),
] ]
def __init__(self, *args: Any, **kwargs: Any) -> None: def __init__(self, *args: Any, **kwargs: Any) -> None:
@ -151,6 +159,7 @@ class PgAutoscaler(MgrModule):
self.autoscale_profile: 'ScaleModeT' = 'scale-up' self.autoscale_profile: 'ScaleModeT' = 'scale-up'
self.sleep_interval = 60 self.sleep_interval = 60
self.mon_target_pg_per_osd = 0 self.mon_target_pg_per_osd = 0
self.threshold = 3.0
def config_notify(self) -> None: def config_notify(self) -> None:
for opt in self.NATIVE_OPTIONS: for opt in self.NATIVE_OPTIONS:
@ -243,6 +252,17 @@ class PgAutoscaler(MgrModule):
]) ])
return 0, table.get_string(), '' return 0, table.get_string(), ''
@CLIWriteCommand("osd pool set threshold")
def set_scaling_threshold(self, num: float) -> Tuple[int, str, str]:
"""
set the autoscaler threshold
A.K.A. the factor by which the new PG_NUM must vary from the existing PG_NUM
"""
if num < 1.0:
return 22, "", "threshold cannot be set less than 1.0"
self.set_module_option("threshold", num)
return 0, "threshold updated", ""
@CLIWriteCommand("osd pool set autoscale-profile scale-up") @CLIWriteCommand("osd pool set autoscale-profile scale-up")
def set_profile_scale_up(self) -> Tuple[int, str, str]: def set_profile_scale_up(self) -> Tuple[int, str, str]:
""" """
@ -556,10 +576,10 @@ class PgAutoscaler(MgrModule):
osdmap: OSDMap, osdmap: OSDMap,
pools: Dict[str, Dict[str, Any]], pools: Dict[str, Dict[str, Any]],
profile: 'ScaleModeT', profile: 'ScaleModeT',
threshold: float = 3.0,
) -> Tuple[List[Dict[str, Any]], ) -> Tuple[List[Dict[str, Any]],
Dict[int, CrushSubtreeResourceStatus]]: Dict[int, CrushSubtreeResourceStatus]]:
assert threshold >= 2.0 threshold = self.threshold
assert threshold >= 1.0
crush_map = osdmap.get_crush() crush_map = osdmap.get_crush()
root_map, overlapped_roots = self.get_subtree_resource_status(osdmap, crush_map) root_map, overlapped_roots = self.get_subtree_resource_status(osdmap, crush_map)