From e36f4677f2e7d7bfe461012e7d519dbb047b998b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 20 Jul 2017 15:44:35 -0400 Subject: [PATCH] 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 --- src/tools/ceph_objectstore_tool.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index c20f0287618..9525223d6fa 100644 --- 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); -- 2.39.5