From 26cbf14ef1e44936f48fdb2be40b59ae2117666f Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 3 Sep 2015 14:22:20 -0700 Subject: [PATCH] ceph-objectstore-tool: White space fixes Signed-off-by: David Zafman (cherry picked from commit 0564f398269d920d90f6d6ecb008ebcd6609d611) --- src/tools/ceph_objectstore_tool.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index d73e784dcc1..b79e2e35a31 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -459,7 +459,7 @@ int action_on_all_objects_in_pg(ObjectStore *store, string pgidstr, action_on_ob continue; // If an exact match or treat no shard as any shard - if (cand_pgid == pgid || + if (cand_pgid == pgid || (pgid.is_no_shard() && pgid.pgid == cand_pgid.pgid)) { colls_to_check.push_back(*i); } @@ -1684,7 +1684,7 @@ int get_object(ObjectStore *store, coll_t coll, bufferlist &bl, OSDMap &curmap, object_locator_t loc(ob.hoid.hobj); pg_t raw_pgid = curmap.object_locator_to_pg(oid, loc); pg_t pgid = curmap.raw_pg_to_pg(raw_pgid); - + spg_t coll_pgid; snapid_t coll_snap; if (coll.is_pg(coll_pgid, coll_snap) == false) { @@ -1692,11 +1692,11 @@ int get_object(ObjectStore *store, coll_t coll, bufferlist &bl, OSDMap &curmap, return -EFAULT; } if (coll_pgid.shard != ob.hoid.shard_id) { - cerr << "INTERNAL ERROR: Importing shard " << coll_pgid.shard + cerr << "INTERNAL ERROR: Importing shard " << coll_pgid.shard << " but object shard is " << ob.hoid.shard_id << std::endl; return -EFAULT; } - + if (coll_pgid.pgid != pgid) { cerr << "Skipping object '" << ob.hoid << "' which belongs in pg " << pgid << std::endl; *skipped_objects = true; -- 2.47.3