From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 18 Feb 2024 02:31:55 +0000 (+0800)
Subject: Merge pull request #54586 from xxhdx1985126/wip-pglog-concatenate
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~416
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34933f5120e4bb7c7ab5281eeaf511cfa5253a84;p=ceph-ci.git

Merge pull request #54586 from xxhdx1985126/wip-pglog-concatenate

tools/ceph_objectstore_tool: add op "expand-log"

Reviewed-by: Samuel Just <sjust@redhat.com>
---

34933f5120e4bb7c7ab5281eeaf511cfa5253a84
diff --cc src/tools/ceph_objectstore_tool.cc
index eeb15a39248,9e99f63a863..be614c42f53
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@@ -4147,10 -4202,9 +4239,10 @@@ int main(int argc, char **argv
  
    // If not an object command nor any of the ops handled below, then output this usage
    // before complaining about a bad pgid
-   if (!vm.count("objcmd") && op != "export" && op != "export-remove" && op != "info" && op != "log" && op != "mark-complete" && op != "trim-pg-log" && op != "trim-pg-log-dups" && op != "pg-log-inject-dups") {
+   if (!vm.count("objcmd") && op != "export" && op != "export-remove" && op != "info" && op != "log" && op != "mark-complete" && op != "trim-pg-log" && op != "trim-pg-log-dups" && op != "pg-log-inject-dups" && op != "extend-log-with-fake-entries") {
      cerr << "Must provide --op (info, log, remove, mkfs, fsck, repair, export, export-remove, import, list, fix-lost, list-pgs, dump-super, meta-list, "
 -      "get-osdmap, set-osdmap, get-inc-osdmap, set-inc-osdmap, mark-complete, reset-last-complete, dump-export, trim-pg-log, trim-pg-log-dups statfs)"
 +      "get-osdmap, set-osdmap, get-superblock, set-superblock, get-inc-osdmap, set-inc-osdmap, mark-complete, reset-last-complete, dump-export, trim-pg-log, "
 +      "trim-pg-log-dups statfs)"
  	 << std::endl;
      usage(desc);
      ret = 1;