From: Samuel Just Date: Thu, 23 Oct 2025 23:59:30 +0000 (-0700) Subject: DNM: add dummy progress command to request spec from rbd_support X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=112e74c4a0549cec87b7eb36aa23a952139b4b4e;p=ceph-ci.git DNM: add dummy progress command to request spec from rbd_support --- diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py index 1a82d4e79f3..c70dd963743 100644 --- a/src/pybind/mgr/progress/module.py +++ b/src/pybind/mgr/progress/module.py @@ -433,8 +433,10 @@ class Module(MgrModule): "perm": "rw"}, {"cmd": "progress off", "desc": "Disable progress tracking", - "perm": "rw"} - + "perm": "rw"}, + {"cmd": "progress test intermodule call", + "desc": "request spec from rbd_suport module DNM", + "perm": "r"} ] MODULE_OPTIONS = [ @@ -876,5 +878,13 @@ class Module(MgrModule): self.off() self.clear() return 0, "", "progress disabled" + elif cmd['prefix'] == "progress test intermodule call": + ret = self.remote('rbd_support', 'test_intermodule_call') + try: + ret.validate() + except Exception as e: + self.getLogger().error("validate failed {}".format(e)) + raise e + return 0, "", "worked" else: raise NotImplementedError(cmd['prefix']) diff --git a/src/pybind/mgr/rbd_support/module.py b/src/pybind/mgr/rbd_support/module.py index d8294eb15b6..edc45cc9737 100644 --- a/src/pybind/mgr/rbd_support/module.py +++ b/src/pybind/mgr/rbd_support/module.py @@ -13,6 +13,7 @@ from typing import cast, Any, Callable, Optional, Tuple, TypeVar from .cli import RBDSupportCLICommand +from ceph.deployment.service_spec import NvmeofServiceSpec, PlacementSpec from mgr_module import MgrModule, Option from threading import Thread, Event @@ -195,6 +196,21 @@ class Module(MgrModule): sort_by_name = sort_by.name if sort_by else OSD_PERF_QUERY_COUNTERS[0] return self.perf.get_perf_stats(pool_spec, sort_by_name) + @RBDSupportCLICommand.Read('rbd test_intermodule_call') + @with_latest_osdmap + def test_intermodule_call(self) -> NvmeofServiceSpec: + with self.perf.lock: + pool = "3" + group = "4" + placement = "asdf" + ret = NvmeofServiceSpec( + service_id=f'{pool}.{group}' if group else pool, + pool=pool, + group=group, + placement=PlacementSpec.from_string(placement), + ) + return ret + @RBDSupportCLICommand.Read('rbd perf image counters') @with_latest_osdmap def perf_image_counters(self,