From 2e9dcb256509e7c921556202052f0cc1dcd91398 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 14 May 2014 15:37:17 -0700 Subject: [PATCH] ceph_filestore_dump: Add --skip-journal-replay and --skip-mount-omap Signed-off-by: David Zafman --- src/tools/ceph_filestore_dump.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tools/ceph_filestore_dump.cc b/src/tools/ceph_filestore_dump.cc index 1a06b6dae5c02..00b92844c17b6 100644 --- a/src/tools/ceph_filestore_dump.cc +++ b/src/tools/ceph_filestore_dump.cc @@ -1105,6 +1105,8 @@ int main(int argc, char **argv) ("file", po::value(&file), "path of file to export or import") ("debug", "Enable diagnostic output to stderr") + ("skip-journal-replay", "Disable journal replay") + ("skip-mount-omap", "Disable mounting of omap") ; po::variables_map vm; @@ -1199,6 +1201,12 @@ int main(int argc, char **argv) debug = true; } + osflagbits_t flags = 0; + if (vm.count("skip-journal-replay")) + flags |= SKIP_JOURNAL_REPLAY; + if (vm.count("skip-mount-omap")) + flags |= SKIP_MOUNT_OMAP; + global_init( &def_args, ceph_options, CEPH_ENTITY_TYPE_OSD, CODE_ENVIRONMENT_UTILITY_NODOUT, 0); @@ -1243,7 +1251,7 @@ int main(int argc, char **argv) return 1; } - ObjectStore *fs = new FileStore(fspath, jpath); + ObjectStore *fs = ObjectStore::create(NULL, "filestore", fspath, jpath, flags); int r = fs->mount(); if (r < 0) { -- 2.39.5