diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-20 14:57:22 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-20 05:19:14 +0000 |
| commit | ed0fa50de855927d652593345cfcb9dda8544625 (patch) | |
| tree | a018c5ea2831b39a9d84d271a34d54d1cd0749e3 | |
| parent | 8cf76063d48455174ed4b6fd29eccac5d1944cd8 (diff) | |
| download | mongo-ed0fa50de855927d652593345cfcb9dda8544625.tar.gz | |
Import wiredtiger: b28742aed07482b945164b755ebc3967d5e03851 from branch mongodb-4.4
ref: d58d8b0f51..b28742aed0
for: 4.4.17
WT-9311 Ensure log messages clearly identify storage HW corruption (#8063) (#8221)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/block/block_read.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e8255e17c2b..fd5b609dfb5 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-4.4", - "commit": "d58d8b0f51124c47f97f14aaa3053b23c480cbe7" + "commit": "b28742aed07482b945164b755ebc3967d5e03851" } diff --git a/src/third_party/wiredtiger/src/block/block_read.c b/src/third_party/wiredtiger/src/block/block_read.c index 3fec75acfe8..0b5788d5a07 100644 --- a/src/third_party/wiredtiger/src/block/block_read.c +++ b/src/third_party/wiredtiger/src/block/block_read.c @@ -274,13 +274,15 @@ __wt_block_read_off(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_ITEM *buf, uin if (!F_ISSET(session, WT_SESSION_QUIET_CORRUPT_FILE)) __wt_errx(session, - "%s: read checksum error for %" PRIu32 "B block at offset %" PRIuMAX - ": calculated block checksum doesn't match expected checksum", + "%s: potential hardware corruption, read checksum error for %" PRIu32 + "B block at offset %" PRIuMAX + ": calculated block checksum doesn't match expected checksum", block->name, size, (uintmax_t)offset); } else if (!F_ISSET(session, WT_SESSION_QUIET_CORRUPT_FILE)) __wt_errx(session, - "%s: read checksum error for %" PRIu32 "B block at offset %" PRIuMAX - ": block header checksum of %#" PRIx32 " doesn't match expected checksum of %#" PRIx32, + "%s: potential hardware corruption, read checksum error for %" PRIu32 + "B block at offset %" PRIuMAX ": block header checksum of %#" PRIx32 + " doesn't match expected checksum of %#" PRIx32, block->name, size, (uintmax_t)offset, swap.checksum, checksum); if (!F_ISSET(session, WT_SESSION_QUIET_CORRUPT_FILE)) |