From 1027e57d9af374f1fa1dee2a585dfe539dc4f5eb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 10 Sep 2017 15:37:10 -0400 Subject: [PATCH] os/bluestore: fsck: fix error prefixes __func__ is now _fsck instead of fsck Signed-off-by: Sage Weil (cherry picked from commit 7d381af7aed14e08823eca4d0b12de14456ef6a1) --- src/os/bluestore/BlueStore.cc | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index a11d1c930e44f..20c6f19fd34f8 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5641,7 +5641,7 @@ int BlueStore::_fsck(bool deep, bool repair) if (is_extent_shard_key(it->key())) { while (!expecting_shards.empty() && expecting_shards.front() < it->key()) { - derr << __func__ << " error: missing shard key " + derr << "fsck error: missing shard key " << pretty_binary_string(expecting_shards.front()) << dendl; ++errors; @@ -5657,18 +5657,18 @@ int BlueStore::_fsck(bool deep, bool repair) uint32_t offset; string okey; get_key_extent_shard(it->key(), &okey, &offset); - derr << __func__ << " error: stray shard 0x" << std::hex << offset + derr << "fsck error: stray shard 0x" << std::hex << offset << std::dec << dendl; if (expecting_shards.empty()) { - derr << __func__ << " error: " << pretty_binary_string(it->key()) + derr << "fsck error: " << pretty_binary_string(it->key()) << " is unexpected" << dendl; ++errors; continue; } while (expecting_shards.front() > it->key()) { - derr << __func__ << " error: saw " << pretty_binary_string(it->key()) + derr << "fsck error: saw " << pretty_binary_string(it->key()) << dendl; - derr << __func__ << " error: exp " + derr << "fsck error: exp " << pretty_binary_string(expecting_shards.front()) << dendl; ++errors; expecting_shards.pop_front(); @@ -5682,7 +5682,7 @@ int BlueStore::_fsck(bool deep, bool repair) ghobject_t oid; int r = get_key_object(it->key(), &oid); if (r < 0) { - derr << __func__ << " error: bad object key " + derr << "fsck error: bad object key " << pretty_binary_string(it->key()) << dendl; ++errors; continue; @@ -5702,7 +5702,7 @@ int BlueStore::_fsck(bool deep, bool repair) } } if (!c) { - derr << __func__ << " error: stray object " << oid + derr << "fsck error: stray object " << oid << " not owned by any collection" << dendl; ++errors; continue; @@ -5713,7 +5713,7 @@ int BlueStore::_fsck(bool deep, bool repair) if (!expecting_shards.empty()) { for (auto &k : expecting_shards) { - derr << __func__ << " error: missing shard key " + derr << "fsck error: missing shard key " << pretty_binary_string(k) << dendl; } ++errors; @@ -5725,12 +5725,12 @@ int BlueStore::_fsck(bool deep, bool repair) OnodeRef o = c->get_onode(oid, false); if (o->onode.nid) { if (o->onode.nid > nid_max) { - derr << __func__ << " error: " << oid << " nid " << o->onode.nid + derr << "fsck error: " << oid << " nid " << o->onode.nid << " > nid_max " << nid_max << dendl; ++errors; } if (used_nids.count(o->onode.nid)) { - derr << __func__ << " error: " << oid << " nid " << o->onode.nid + derr << "fsck error: " << oid << " nid " << o->onode.nid << " already in use" << dendl; ++errors; continue; // go for next object @@ -5752,7 +5752,7 @@ int BlueStore::_fsck(bool deep, bool repair) get_extent_shard_key(o->key, s.shard_info->offset, &expecting_shards.back()); if (s.shard_info->offset >= o->onode.size) { - derr << __func__ << " error: " << oid << " shard 0x" << std::hex + derr << "fsck error: " << oid << " shard 0x" << std::hex << s.shard_info->offset << " past EOF at 0x" << o->onode.size << std::dec << dendl; ++errors; @@ -5766,14 +5766,14 @@ int BlueStore::_fsck(bool deep, bool repair) for (auto& l : o->extent_map.extent_map) { dout(20) << __func__ << " " << l << dendl; if (l.logical_offset < pos) { - derr << __func__ << " error: " << oid << " lextent at 0x" + derr << "fsck error: " << oid << " lextent at 0x" << std::hex << l.logical_offset << " overlaps with the previous, which ends at 0x" << pos << std::dec << dendl; ++errors; } if (o->extent_map.spans_shard(l.logical_offset, l.length)) { - derr << __func__ << " error: " << oid << " lextent at 0x" + derr << "fsck error: " << oid << " lextent at 0x" << std::hex << l.logical_offset << "~" << l.length << " spans a shard boundary" << std::dec << dendl; @@ -5819,7 +5819,7 @@ int BlueStore::_fsck(bool deep, bool repair) << std::dec << " for " << *i.first << dendl; const bluestore_blob_t& blob = i.first->get_blob(); if (i.second & blob.unused) { - derr << __func__ << " error: " << oid << " blob claims unused 0x" + derr << "fsck error: " << oid << " blob claims unused 0x" << std::hex << blob.unused << " but extents reference 0x" << i.second << " on blob " << *i.first << dendl; @@ -5841,7 +5841,7 @@ int BlueStore::_fsck(bool deep, bool repair) if ((blob.unused & mask) == mask) { // this csum chunk region is marked unused if (blob.get_csum_item(p) != 0) { - derr << __func__ << " error: " << oid + derr << "fsck error: " << oid << " blob claims csum chunk 0x" << std::hex << pos << "~" << csum_chunk_size << " is unused (mask 0x" << mask << " of unused 0x" @@ -5859,7 +5859,7 @@ int BlueStore::_fsck(bool deep, bool repair) const bluestore_blob_t& blob = i.first->get_blob(); bool equal = i.first->get_blob_use_tracker().equal(i.second); if (!equal) { - derr << __func__ << " error: " << oid << " blob " << *i.first + derr << "fsck error: " << oid << " blob " << *i.first << " doesn't match expected ref_map " << i.second << dendl; ++errors; } @@ -5870,12 +5870,12 @@ int BlueStore::_fsck(bool deep, bool repair) } if (blob.is_shared()) { if (i.first->shared_blob->get_sbid() > blobid_max) { - derr << __func__ << " error: " << oid << " blob " << blob + derr << "fsck error: " << oid << " blob " << blob << " sbid " << i.first->shared_blob->get_sbid() << " > blobid_max " << blobid_max << dendl; ++errors; } else if (i.first->shared_blob->get_sbid() == 0) { - derr << __func__ << " error: " << oid << " blob " << blob + derr << "fsck error: " << oid << " blob " << blob << " marked as shared but has uninitialized sbid" << dendl; ++errors; @@ -5901,14 +5901,14 @@ int BlueStore::_fsck(bool deep, bool repair) int r = _do_read(c.get(), o, 0, o->onode.size, bl, 0); if (r < 0) { ++errors; - derr << __func__ << " error: " << oid << " error during read: " + derr << "fsck error: " << oid << " error during read: " << cpp_strerror(r) << dendl; } } // omap if (o->onode.has_omap()) { if (used_omap_head.count(o->onode.nid)) { - derr << __func__ << " error: " << oid << " omap_head " << o->onode.nid + derr << "fsck error: " << oid << " omap_head " << o->onode.nid << " already in use" << dendl; ++errors; } else { @@ -5924,14 +5924,14 @@ int BlueStore::_fsck(bool deep, bool repair) string key = it->key(); uint64_t sbid; if (get_key_shared_blob(key, &sbid)) { - derr << __func__ << " error: bad key '" << key + derr << "fsck error: bad key '" << key << "' in shared blob namespace" << dendl; ++errors; continue; } auto p = sb_info.find(sbid); if (p == sb_info.end()) { - derr << __func__ << " error: found stray shared blob data for sbid 0x" + derr << "fsck error: found stray shared blob data for sbid 0x" << std::hex << sbid << std::dec << dendl; ++errors; } else { @@ -5943,7 +5943,7 @@ int BlueStore::_fsck(bool deep, bool repair) ::decode(shared_blob, blp); dout(20) << __func__ << " " << *sbi.sb << " " << shared_blob << dendl; if (shared_blob.ref_map != sbi.ref_map) { - derr << __func__ << " error: shared blob 0x" << std::hex << sbid + derr << "fsck error: shared blob 0x" << std::hex << sbid << std::dec << " ref_map " << shared_blob.ref_map << " != expected " << sbi.ref_map << dendl; ++errors; @@ -5961,12 +5961,12 @@ int BlueStore::_fsck(bool deep, bool repair) } } for (auto &p : sb_info) { - derr << __func__ << " error: shared_blob 0x" << p.first + derr << "fsck error: shared_blob 0x" << p.first << " key is missing (" << *p.second.sb << ")" << dendl; ++errors; } if (!(actual_statfs == expected_statfs)) { - derr << __func__ << " error: actual " << actual_statfs + derr << "fsck error: actual " << actual_statfs << " != expected " << expected_statfs << dendl; ++errors; } @@ -5978,7 +5978,7 @@ int BlueStore::_fsck(bool deep, bool repair) uint64_t omap_head; _key_decode_u64(it->key().c_str(), &omap_head); if (used_omap_head.count(omap_head) == 0) { - derr << __func__ << " error: found stray omap data on omap_head " + derr << "fsck error: found stray omap data on omap_head " << omap_head << dendl; ++errors; } @@ -5995,7 +5995,7 @@ int BlueStore::_fsck(bool deep, bool repair) try { ::decode(wt, p); } catch (buffer::error& e) { - derr << __func__ << " error: failed to decode deferred txn " + derr << "fsck error: failed to decode deferred txn " << pretty_binary_string(it->key()) << dendl; r = -EIO; goto out_scan; @@ -6072,7 +6072,7 @@ int BlueStore::_fsck(bool deep, bool repair) while (true) { size_t next = used_blocks.find_next(cur); if (next != cur + 1) { - derr << __func__ << " error: leaked extent 0x" << std::hex + derr << "fsck error: leaked extent 0x" << std::hex << ((uint64_t)start * min_alloc_size) << "~" << ((cur + 1 - start) * min_alloc_size) << std::dec << dendl; -- 2.39.5