From 0c173c48b6832ce4aaf5e3ffa3fe0d172dea2672 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 8 Jan 2021 12:47:27 +0100 Subject: [PATCH] mgr/cephadm: OSDRemovalQueue: remove some trivial wrappers Signed-off-by: Sebastian Wagner (cherry picked from commit 1f39532e0398c85ccd0c238feb8e3a947758b54c) --- src/pybind/mgr/cephadm/services/osd.py | 13 ++----------- src/pybind/mgr/cephadm/tests/test_osd_removal.py | 6 +++--- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index 7822d8a8cb1a6..f09011ce0d4a5 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -660,13 +660,13 @@ class OSDRemovalQueue(object): # self could change while this is processing (osds get added from the CLI) # The new set is: 'an intersection of all osds that are still not empty/removed (new_queue) and # osds that were added while this method was executed' - self.intersection_update(new_queue) + self.osds.intersection_update(new_queue) self.save_to_store() def cleanup(self) -> None: # OSDs can always be cleaned up manually. This ensures that we run on existing OSDs for osd in self.not_in_cluster(): - self.remove(osd) + self.osds.remove(osd) def save_to_store(self) -> None: osd_queue = [osd.to_json() for osd in self.all_osds()] @@ -719,15 +719,6 @@ class OSDRemovalQueue(object): logger.debug(f"Could not find {osd} in queue.") raise KeyError - def remove(self, osd: OSD) -> None: - self.osds.remove(osd) - - def add(self, osd: OSD) -> None: - self.osds.add(osd) - - def intersection_update(self, other: Set[OSD]) -> None: - self.osds.intersection_update(other) - def __eq__(self, other: Any) -> bool: if not isinstance(other, OSDRemovalQueue): return False diff --git a/src/pybind/mgr/cephadm/tests/test_osd_removal.py b/src/pybind/mgr/cephadm/tests/test_osd_removal.py index 9fd5f9b760ea7..0fb81796ab380 100644 --- a/src/pybind/mgr/cephadm/tests/test_osd_removal.py +++ b/src/pybind/mgr/cephadm/tests/test_osd_removal.py @@ -93,7 +93,7 @@ class TestOSDRemoval: cephadm_module.to_remove_osds.load_from_store() expected = OSDRemovalQueue(cephadm_module) - expected.add(OSD(osd_id=35, remove_util=rm_util, draining=True)) + expected.osds.add(OSD(osd_id=35, remove_util=rm_util, draining=True)) assert cephadm_module.to_remove_osds == expected @@ -220,7 +220,7 @@ class TestOSDRemovalQueue: def test_queue_size(self, osd_obj): q = OSDRemovalQueue(mock.Mock()) assert q.queue_size() == 0 - q.add(osd_obj) + q.osds.add(osd_obj) assert q.queue_size() == 1 @mock.patch("cephadm.services.osd.OSD.start") @@ -242,6 +242,6 @@ class TestOSDRemovalQueue: @mock.patch("cephadm.services.osd.OSD.exists") def test_rm(self, exist, stop, osd_obj): q = OSDRemovalQueue(mock.Mock()) - q.add(osd_obj) + q.osds.add(osd_obj) q.rm(osd_obj) osd_obj.stop.assert_called_once() -- 2.39.5