ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't store version number in MANIFEST

Browse Source 
Summary: Talked to <insert internal project name> folks and they found it really scary that they won't be able to roll back once they upgrade to 2.8. We should fix this.

Test Plan: make check

Reviewers: haobo, ljin

Reviewed By: ljin

CC: leveldb

Differential Revision: https://reviews.facebook.net/D17343
This commit is contained in:
Igor Canadi
2014-03-31 11:33:09 -07:00
parent 5ec38c3d3e
commit 577556d5f9
5 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
db/version_set.cc
View File

@@ -1768,8 +1768,6 @@ Status VersionSet::Recover() {
return s;
}
bool have_version_number = false;
bool log_number_decrease = false;
bool have_log_number = false;
bool have_prev_log_number = false;
bool have_next_file = false;
@@ -1810,17 +1808,15 @@ Status VersionSet::Recover() {
builder.Apply(&edit);
if (edit.has_version_number_) {
have_version_number = true;
}
// Only a flush's edit or a new snapshot can write log number during
// LogAndApply. Since memtables are flushed and inserted into
// manifest_writers_ queue in order, the log number in MANIFEST file
// should be monotonically increasing.
if (edit.has_log_number_) {
if (have_log_number && log_number >= edit.log_number_) {
log_number_decrease = true;
Log(options_->info_log,
"decreasing of log_number is detected "
"in MANIFEST\n");
} else {
log_number = edit.log_number_;
have_log_number = true;
@@ -1842,20 +1838,6 @@ Status VersionSet::Recover() {
have_last_sequence = true;
}
}
if (s.ok() && log_number_decrease) {
// Since release 2.8, version number is added into MANIFEST file.
// Prior release 2.8, a bug in LogAndApply() can cause log_number
// to be smaller than the one from previous edit. To ensure backward
// compatibility, only fail for MANIFEST genearated by release 2.8
// and after.
if (have_version_number) {
s = Status::Corruption("log number decreases");
} else {
Log(options_->info_log, "decreasing of log_number is detected "
"in MANIFEST\n");
}
}
}
if (s.ok()) {
@@ -2125,7 +2107,6 @@ Status VersionSet::WriteSnapshot(log::Writer* log) {
// Save metadata
VersionEdit edit;
edit.SetVersionNumber();
edit.SetComparatorName(icmp_.user_comparator()->Name());
// Save files