openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libsnapshot: Stop reading ops once we reach a footer."

This commit is contained in:
David Anderson 2020-10-29 00:27:02 +00:00 committed by Gerrit Code Review
parent 7173ca82a4 485fe695c1
commit a1a5fdc6ee
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs_mgr/libsnapshot/cow_reader.cpp
View File

@ -18,6 +18,7 @@
#include <unistd.h>
#include <limits>
#include <optional>
#include <vector>
#include <android-base/file.h>
@ -117,8 +118,7 @@ bool CowReader::ParseOps() {
PLOG(ERROR) << "lseek ops failed";
return false;
}
uint64_t next_last_label = 0;
bool has_next = false;
std::optional<uint64_t> next_last_label;
auto ops_buffer = std::make_shared<std::vector<CowOperation>>();
if (has_footer_) ops_buffer->reserve(footer_.op.num_ops);
uint64_t current_op_num = 0;
@ -146,11 +146,23 @@ bool CowReader::ParseOps() {
has_last_label_ = true;
last_label_ = current_op.source;
} else {
last_label_ = next_last_label;
if (has_next) has_last_label_ = true;
next_last_label = current_op.source;
has_next = true;
if (next_last_label) {
last_label_ = next_last_label.value();
has_last_label_ = true;
}
next_last_label = {current_op.source};
}
} else if (current_op.type == kCowFooterOp) {
memcpy(&footer_.op, &current_op, sizeof(footer_.op));
if (android::base::ReadFully(fd_, &footer_.data, sizeof(footer_.data))) {
has_footer_ = true;
if (next_last_label) {
last_label_ = next_last_label.value();
has_last_label_ = true;
}
}
break;
}
}

3
fs_mgr/libsnapshot/snapshot_test.cpp
View File

@ -953,6 +953,9 @@ class SnapshotUpdateTest : public SnapshotTest {
if (!WriteRandomData(writer.get(), &hashes_[name])) {
return AssertionFailure() << "Unable to write random data to snapshot " << name;
}
if (!writer->Finalize()) {
return AssertionFailure() << "Unable to finalize COW for " << name;
}
} else {
std::string path;
auto res = MapUpdateSnapshot(name, &path);