ceph_objectstore_tool: always write may_include_deletes if it's set

This prevents us from importing a missing set without also setting the
may_include_deletes_in_missing omap value if appropriate.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index c20f0287618ee2845839e80f111cd552cba21acb..9525223d6fa86661347dbab4fa323a1f83160d37 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -480,7 +480,7 @@ int write_pg(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info,
       t, &km, log, coll, info.pgid.make_pgmeta_oid(), divergent, true);
   } else {
     pg_missing_tracker_t tmissing(missing);
-    bool rebuilt_missing_set_with_deletes = false;
+    bool rebuilt_missing_set_with_deletes = missing.may_include_deletes;
     PGLog::write_log_and_missing(
       t, &km, log, coll, info.pgid.make_pgmeta_oid(), tmissing, true,
       &rebuilt_missing_set_with_deletes);