andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

db/log_reader: combine kBadRecord{Len,Checksum} for readability

Browse Source 
These vary only by the corruption string reported.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-03-14 17:22:29 -04:00 committed by krad
parent 34df1c94d5
commit 2b2a898e0b
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/log_reader.cc
View File

@ -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;