mgr/cephadm: clean up deploy/removal queue if apply throws Exception

If we don't, the next time _apply_all_services gets called,
assuming it decides the same daemons should be added/removed
it will end up trying to deploy/remove double the daemons
it should

Signed-off-by: Adam King <[email protected]>
(cherry picked from commit 328fa3c)

Resolves: rhbz#2372821

Author: adk3798

src/pybind/mgr/cephadm/serve.py

@@ -117,8 +117,14 @@ def serve(self) -> None:
                     if self.mgr.migration.is_migration_ongoing():
                         continue
 
-                    if self._apply_all_services():
-                        continue  # did something, refresh
+                    try:
+                        if self._apply_all_services():
+                            continue  # did something, refresh
+                    except Exception:
+                        # guarantee we don't leave things in the deploy/removal queue
+                        self.mgr.daemon_deploy_queue.clear_queued_daemons()
+                        self.mgr.daemon_removal_queue.clear_queued_daemons()
+                        raise
 
                     self._check_daemons()