ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blob: log blob ID as hex, again

Browse Source 
This is a followup to commit f4dc558245
which strove to log blob IDs as hex to make small blob IDs more
recognizable. That commit missed a few cases where the blob ID is logged
as decimal.

Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: I75d1b5973ee7e812f7caf0e826d3edbcba126743
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17641
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Mike Gerdts 2023-04-18 13:15:16 -05:00 committed by David Ko
parent 8d65ab7476
commit 54adced8e5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/blob/blobstore.c
View File

@ -893,8 +893,8 @@ blob_parse(const struct spdk_blob_md_page *pages, uint32_t page_count,
* happen for example if a bogus blobid is passed in through open. * happen for example if a bogus blobid is passed in through open.
*/ */
if (blob->id != pages[0].id) { if (blob->id != pages[0].id) {
SPDK_ERRLOG("Blobid (%" PRIu64 ") doesn't match what's in metadata (%" PRIu64 ")\n", SPDK_ERRLOG("Blobid (0x%" PRIx64 ") doesn't match what's in metadata "
blob->id, pages[0].id); "(0x%" PRIx64 ")\n", blob->id, pages[0].id);
return -ENOENT; return -ENOENT;
} }
@ -1597,7 +1597,7 @@ blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
} }
if (bserrno) { if (bserrno) {
SPDK_ERRLOG("Metadata page %d read failed for blobid %" PRIu64 ": %d\n", SPDK_ERRLOG("Metadata page %d read failed for blobid 0x%" PRIx64 ": %d\n",
current_page, blob->id, bserrno); current_page, blob->id, bserrno);
blob_load_final(ctx, bserrno); blob_load_final(ctx, bserrno);
return; return;
@ -1606,7 +1606,7 @@ blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
page = &ctx->pages[ctx->num_pages - 1]; page = &ctx->pages[ctx->num_pages - 1];
crc = blob_md_page_calc_crc(page); crc = blob_md_page_calc_crc(page);
if (crc != page->crc) { if (crc != page->crc) {
SPDK_ERRLOG("Metadata page %d crc mismatch for blobid %" PRIu64 "\n", SPDK_ERRLOG("Metadata page %d crc mismatch for blobid 0x%" PRIx64 "\n",
current_page, blob->id); current_page, blob->id);
blob_load_final(ctx, -EINVAL); blob_load_final(ctx, -EINVAL);
return; return;
@ -5986,7 +5986,7 @@ bs_create_blob(struct spdk_blob_store *bs,
id = bs_page_to_blobid(page_idx); id = bs_page_to_blobid(page_idx);
SPDK_DEBUGLOG(blob, "Creating blob with id %" PRIu64 " at page %u\n", id, page_idx); SPDK_DEBUGLOG(blob, "Creating blob with id 0x%" PRIx64 " at page %u\n", id, page_idx);
spdk_blob_opts_init(&opts_local, sizeof(opts_local)); spdk_blob_opts_init(&opts_local, sizeof(opts_local));
if (opts) { if (opts) {
@ -6489,8 +6489,8 @@ bs_snapshot_origblob_open_cpl(void *cb_arg, struct spdk_blob *_blob, int bserrno
ctx->original.blob = _blob; ctx->original.blob = _blob;
if (_blob->data_ro || _blob->md_ro) { if (_blob->data_ro || _blob->md_ro) {
SPDK_DEBUGLOG(blob, "Cannot create snapshot from read only blob with id %" PRIu64 "\n", SPDK_DEBUGLOG(blob, "Cannot create snapshot from read only blob with id 0x%"
_blob->id); PRIx64 "\n", _blob->id);
ctx->bserrno = -EINVAL; ctx->bserrno = -EINVAL;
spdk_blob_close(_blob, bs_clone_snapshot_cleanup_finish, ctx); spdk_blob_close(_blob, bs_clone_snapshot_cleanup_finish, ctx);
return; return;