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>
main
Sage Weil 9 years ago committed by krad
parent 34df1c94d5
commit 2b2a898e0b
  1. 17
      db/log_reader.cc

@ -192,20 +192,6 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch,
break; break;
case kBadRecordLen: 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: case kBadRecordChecksum:
if (recycled_ && if (recycled_ &&
wal_recovery_mode == wal_recovery_mode ==
@ -213,6 +199,9 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch,
scratch->clear(); scratch->clear();
return false; return false;
} }
if (record_type == kBadRecordLen)
ReportCorruption(drop_size, "bad record length");
else
ReportCorruption(drop_size, "checksum mismatch"); ReportCorruption(drop_size, "checksum mismatch");
if (in_fragmented_record) { if (in_fragmented_record) {
ReportCorruption(scratch->size(), "error in middle of record"); ReportCorruption(scratch->size(), "error in middle of record");

Loading…
Cancel
Save