From: Kefu Chai <kchai@redhat.com>
Date: Tue, 25 Jun 2019 02:46:20 +0000 (+0800)
Subject: Merge pull request #28395 from athanatos/sjust/wip-crimson-op
X-Git-Tag: v15.1.0~2378
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c929065a73664d34e01829e999fb92bfe0a879a;p=ceph.git

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

Add structures for tracking in progress operations

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

6c929065a73664d34e01829e999fb92bfe0a879a
diff --cc src/crimson/osd/main.cc
index 48e3ae7155e,bbe225833e5..1bdb734f9d4
--- a/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();
          }
        });
      });