ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots"

Browse source
This commit is contained in:
Treehugger Robot 2020-02-01 12:22:38 +00:00 • committed by Gerrit Code Review
commit afb6b354a9
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -1957,8 +1957,17 @@ Return SnapshotManager::CreateUpdateSnapshots(const DeltaArchiveManifest& manife
auto current_super = device_->GetSuperDevice(current_slot); auto current_super = device_->GetSuperDevice(current_slot);
auto current_metadata = MetadataBuilder::New(opener, current_super, current_slot); auto current_metadata = MetadataBuilder::New(opener, current_super, current_slot);
if (current_metadata == nullptr) {
LOG(ERROR) << "Cannot create metadata builder.";
return Return::Error();
}
auto target_metadata = auto target_metadata =
MetadataBuilder::NewForUpdate(opener, current_super, current_slot, target_slot); MetadataBuilder::NewForUpdate(opener, current_super, current_slot, target_slot);
if (target_metadata == nullptr) {
LOG(ERROR) << "Cannot create target metadata builder.";
return Return::Error();
}
// Delete partitions with target suffix in |current_metadata|. Otherwise, // Delete partitions with target suffix in |current_metadata|. Otherwise,
// partition_cow_creator recognizes these left-over partitions as used space. // partition_cow_creator recognizes these left-over partitions as used space.

6
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -793,6 +793,7 @@ class SnapshotUpdateTest : public SnapshotTest {
// Initialize source partition metadata using |manifest_|. // Initialize source partition metadata using |manifest_|.
src_ = MetadataBuilder::New(*opener_, "super", 0); src_ = MetadataBuilder::New(*opener_, "super", 0);
ASSERT_NE(src_, nullptr);
ASSERT_TRUE(FillFakeMetadata(src_.get(), manifest_, "_a")); ASSERT_TRUE(FillFakeMetadata(src_.get(), manifest_, "_a"));
// Add sys_b which is like system_other. // Add sys_b which is like system_other.
ASSERT_TRUE(src_->AddGroup("group_b", kGroupSize)); ASSERT_TRUE(src_->AddGroup("group_b", kGroupSize));
@ -987,6 +988,7 @@ TEST_F(SnapshotUpdateTest, FullUpdateFlow) {
// Test that partitions prioritize using space in super. // Test that partitions prioritize using space in super.
auto tgt = MetadataBuilder::New(*opener_, "super", 1); auto tgt = MetadataBuilder::New(*opener_, "super", 1);
ASSERT_NE(tgt, nullptr);
ASSERT_NE(nullptr, tgt->FindPartition("sys_b-cow")); ASSERT_NE(nullptr, tgt->FindPartition("sys_b-cow"));
ASSERT_NE(nullptr, tgt->FindPartition("vnd_b-cow")); ASSERT_NE(nullptr, tgt->FindPartition("vnd_b-cow"));
ASSERT_EQ(nullptr, tgt->FindPartition("prd_b-cow")); ASSERT_EQ(nullptr, tgt->FindPartition("prd_b-cow"));
@ -1200,7 +1202,9 @@ TEST_F(SnapshotUpdateTest, ReclaimCow) {
// Check that the old COW space is reclaimed and does not occupy space of mapped partitions. // Check that the old COW space is reclaimed and does not occupy space of mapped partitions.
auto src = MetadataBuilder::New(*opener_, "super", 1); auto src = MetadataBuilder::New(*opener_, "super", 1);
ASSERT_NE(src, nullptr);
auto tgt = MetadataBuilder::New(*opener_, "super", 0); auto tgt = MetadataBuilder::New(*opener_, "super", 0);
ASSERT_NE(tgt, nullptr);
for (const auto& cow_part_name : {"sys_a-cow", "vnd_a-cow", "prd_a-cow"}) { for (const auto& cow_part_name : {"sys_a-cow", "vnd_a-cow", "prd_a-cow"}) {
auto* cow_part = tgt->FindPartition(cow_part_name); auto* cow_part = tgt->FindPartition(cow_part_name);
ASSERT_NE(nullptr, cow_part) << cow_part_name << " does not exist in target metadata"; ASSERT_NE(nullptr, cow_part) << cow_part_name << " does not exist in target metadata";
@ -1291,6 +1295,7 @@ TEST_F(SnapshotUpdateTest, MergeCannotRemoveCow) {
SetSize(vnd_, 5_MiB); SetSize(vnd_, 5_MiB);
SetSize(prd_, 5_MiB); SetSize(prd_, 5_MiB);
src_ = MetadataBuilder::New(*opener_, "super", 0); src_ = MetadataBuilder::New(*opener_, "super", 0);
ASSERT_NE(src_, nullptr);
src_->RemoveGroupAndPartitions(group_->name() + "_a"); src_->RemoveGroupAndPartitions(group_->name() + "_a");
src_->RemoveGroupAndPartitions(group_->name() + "_b"); src_->RemoveGroupAndPartitions(group_->name() + "_b");
ASSERT_TRUE(FillFakeMetadata(src_.get(), manifest_, "_a")); ASSERT_TRUE(FillFakeMetadata(src_.get(), manifest_, "_a"));
@ -1664,6 +1669,7 @@ TEST_P(FlashAfterUpdateTest, FlashSlotAfterUpdate) {
// Simulate flashing |flashed_slot|. This clears the UPDATED flag. // Simulate flashing |flashed_slot|. This clears the UPDATED flag.
auto flashed_builder = MetadataBuilder::New(*opener_, "super", flashed_slot); auto flashed_builder = MetadataBuilder::New(*opener_, "super", flashed_slot);
ASSERT_NE(flashed_builder, nullptr);
flashed_builder->RemoveGroupAndPartitions(group_->name() + flashed_slot_suffix); flashed_builder->RemoveGroupAndPartitions(group_->name() + flashed_slot_suffix);
flashed_builder->RemoveGroupAndPartitions(kCowGroupName); flashed_builder->RemoveGroupAndPartitions(kCowGroupName);
ASSERT_TRUE(FillFakeMetadata(flashed_builder.get(), manifest_, flashed_slot_suffix)); ASSERT_TRUE(FillFakeMetadata(flashed_builder.get(), manifest_, flashed_slot_suffix));