diff options
| author | Sage Weil <sage@redhat.com> | 2016-03-14 17:22:29 -0400 |
|---|---|---|
| committer | krad <krad@fb.com> | 2016-05-22 22:00:15 -0700 |
| commit | 2b2a898e0b9ffe12e4ffb9e2bf4a697c843278f0 (patch) | |
| tree | c1cae051677cddaf460a88cb272060738e12c641 /db/log_reader.cc | |
| parent | 34df1c94d5ece7463368d2c771fd021c72692e3f (diff) | |
db/log_reader: combine kBadRecord{Len,Checksum} for readability
These vary only by the corruption string reported.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'db/log_reader.cc')
| -rw-r--r-- | db/log_reader.cc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/db/log_reader.cc b/db/log_reader.cc index f2fd97f62..a33d7e480 100644 --- a/db/log_reader.cc +++ b/db/log_reader.cc @@ -192,20 +192,6 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch, break; case kBadRecordLen: - if (recycled_ && - wal_recovery_mode == - WALRecoveryMode::kTolerateCorruptedTailRecords) { - scratch->clear(); - return false; - } - ReportCorruption(drop_size, "bad record length"); - if (in_fragmented_record) { - ReportCorruption(scratch->size(), "error in middle of record"); - in_fragmented_record = false; - scratch->clear(); - } - break; - case kBadRecordChecksum: if (recycled_ && wal_recovery_mode == @@ -213,7 +199,10 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch, scratch->clear(); return false; } - ReportCorruption(drop_size, "checksum mismatch"); + if (record_type == kBadRecordLen) + ReportCorruption(drop_size, "bad record length"); + else + ReportCorruption(drop_size, "checksum mismatch"); if (in_fragmented_record) { ReportCorruption(scratch->size(), "error in middle of record"); in_fragmented_record = false; |