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

mgr/mds_autoscaler: adapt to now orch interface

Browse Source 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2021-02-08 09:54:07 +01:00
parent 1ecb93a470
commit 1d40632826
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/mds_autoscaler/module.py
View File

@ -25,7 +25,6 @@ class MDSAutoscaler(orchestrator.OrchestratorClientMixin, MgrModule):
completion = self.describe_service(service_type='mds',
service_name=service,
refresh=True)
self._orchestrator_wait([completion])
orchestrator.raise_if_exception(completion)
if completion.result:
return completion.result[0]
@ -80,7 +79,6 @@ class MDSAutoscaler(orchestrator.OrchestratorClientMixin, MgrModule):
self.log.info(f"fs {fs_name}: adjusting daemon count from {svc.spec.placement.count} to {want}")
newspec = self.update_daemon_count(svc.spec, fs_name, want)
completion = self.apply_mds(newspec)
self._orchestrator_wait([completion])
orchestrator.raise_if_exception(completion)
except orchestrator.OrchestratorError as e:
self.log.exception(f"fs {fs_name}: exception while updating service: {e}")

16
src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
View File

@ -2,7 +2,7 @@ import pytest
from unittest import mock
from ceph.deployment.service_spec import ServiceSpec, PlacementSpec
from orchestrator import DaemonDescription, Completion, ServiceDescription
from orchestrator import DaemonDescription, OrchResult, ServiceDescription
try:
from typing import Any, List
@ -16,10 +16,7 @@ from mds_autoscaler.module import MDSAutoscaler
@pytest.yield_fixture()
def mds_autoscaler_module():
with mock.patch("mds_autoscaler.module.MDSAutoscaler._orchestrator_wait"):
m = MDSAutoscaler('cephadm', 0, 0)
yield m
yield MDSAutoscaler('cephadm', 0, 0)
class TestCephadm(object):
@ -29,7 +26,7 @@ class TestCephadm(object):
@mock.patch("mds_autoscaler.module.MDSAutoscaler.describe_service")
@mock.patch("mds_autoscaler.module.MDSAutoscaler.apply_mds")
def test_scale_up(self, _apply_mds, _describe_service, _list_daemons, _get, mds_autoscaler_module: MDSAutoscaler):
daemons = Completion(value=[
daemons = OrchResult(result=[
DaemonDescription(
hostname='myhost',
daemon_type='mds',
@ -41,10 +38,9 @@ class TestCephadm(object):
daemon_id='fs_name.myhost.b'
),
])
daemons.finalize()
_list_daemons.return_value = daemons
services = Completion(value=[
services = OrchResult(result=[
ServiceDescription(
spec=ServiceSpec(
service_type='mds',
@ -55,11 +51,9 @@ class TestCephadm(object):
)
)
])
services.finalize()
_describe_service.return_value = services
apply = Completion(value='')
apply.finalize()
apply = OrchResult(result='')
_apply_mds.return_value = apply