Merge pull request #28395 from athanatos/sjust/wip-crimson-op

Add structures for tracking in progress operations

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/crimson/osd/main.cc
index 48e3ae7155e077e97a39e393dc9d7ec59da51925,bbe225833e5372a6a5059fc4fb817200c7c7fcea..1bdb734f9d44be5d59847130db0541fb5e592040
--- 1/src/crimson/osd/main.cc
--- 2/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@@ -184,14 -145,13 +184,14 @@@ int main(int argc, char* argv[]
          if (config.count("mkfs")) {
            osd.invoke_on(
            0,
-           &OSD::mkfs,
+           &ceph::osd::OSD::mkfs,
            local_conf().get_val<uuid_d>("osd_uuid"),
 -          local_conf().get_val<uuid_d>("fsid")).then([] {
 -            seastar::engine().exit(0);
 -          }).get();
 +          local_conf().get_val<uuid_d>("fsid")).get();
 +        }
 +        if (config.count("mkkey") || config.count("mkfs")) {
 +          seastar::engine().exit(0);
          } else {
-           osd.invoke_on(0, &OSD::start).get();
+           osd.invoke_on(0, &ceph::osd::OSD::start).get();
          }
        });
      });

diff --cc src/crimson/osd/osd.cc
Simple merge

diff --cc src/osd/PeeringState.cc
Simple merge

diff --cc src/osd/PeeringState.h
Simple merge