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

libsnapshot: Fix new partitions not transitioning in second-stage init.

Browse source 
Bug: 196922070
Test: vts_libsnapshot_test
Merged-In: If8a7afde218fd719e4426dc1dda41f53a4e6544b
Change-Id: If8a7afde218fd719e4426dc1dda41f53a4e6544b
This commit is contained in:
David Anderson 2021-09-01 20:51:35 -07:00
parent 0a6f250242
commit 5932ed07db
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -1456,7 +1456,7 @@ bool SnapshotManager::PerformInitTransition(InitTransition transition,
std::vector<std::string>* snapuserd_argv) { std::vector<std::string>* snapuserd_argv) {
LOG(INFO) << "Performing transition for snapuserd."; LOG(INFO) << "Performing transition for snapuserd.";
// Don't use EnsuerSnapuserdConnected() because this is called from init, // Don't use EnsureSnapuserdConnected() because this is called from init,
// and attempting to do so will deadlock. // and attempting to do so will deadlock.
if (!snapuserd_client_ && transition != InitTransition::SELINUX_DETACH) { if (!snapuserd_client_ && transition != InitTransition::SELINUX_DETACH) {
snapuserd_client_ = SnapuserdClient::Connect(kSnapuserdSocket, 10s); snapuserd_client_ = SnapuserdClient::Connect(kSnapuserdSocket, 10s);
@ -1513,8 +1513,15 @@ bool SnapshotManager::PerformInitTransition(InitTransition transition,
continue; continue;
} }
std::string source_device_name;
if (snapshot_status.old_partition_size() > 0) {
source_device_name = GetSourceDeviceName(snapshot);
} else {
source_device_name = GetBaseDeviceName(snapshot);
}
std::string source_device; std::string source_device;
if (!dm.GetDmDevicePathByName(GetSourceDeviceName(snapshot), &source_device)) { if (!dm.GetDmDevicePathByName(source_device_name, &source_device)) {
LOG(ERROR) << "Could not get device path for " << GetSourceDeviceName(snapshot); LOG(ERROR) << "Could not get device path for " << GetSourceDeviceName(snapshot);
continue; continue;
} }

12
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -2071,14 +2071,24 @@ TEST_F(SnapshotUpdateTest, AddPartition) {
// After reboot, init does first stage mount. // After reboot, init does first stage mount.
auto init = NewManagerForFirstStageMount("_b"); auto init = NewManagerForFirstStageMount("_b");
ASSERT_NE(init, nullptr); ASSERT_NE(init, nullptr);
ASSERT_TRUE(init->EnsureSnapuserdConnected());
init->set_use_first_stage_snapuserd(true);
ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount()); ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());
ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super", snapshot_timeout_)); ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super", snapshot_timeout_));
// Check that the target partitions have the same content. // Check that the target partitions have the same content.
for (const auto& name : {"sys_b", "vnd_b", "prd_b", "dlkm_b"}) { std::vector<std::string> partitions = {"sys_b", "vnd_b", "prd_b", "dlkm_b"};
for (const auto& name : partitions) {
ASSERT_TRUE(IsPartitionUnchanged(name)); ASSERT_TRUE(IsPartitionUnchanged(name));
} }
ASSERT_TRUE(init->PerformInitTransition(SnapshotManager::InitTransition::SECOND_STAGE));
for (const auto& name : partitions) {
ASSERT_TRUE(init->snapuserd_client()->WaitForDeviceDelete(name + "-user-cow-init"));
}
// Initiate the merge and wait for it to be completed. // Initiate the merge and wait for it to be completed.
ASSERT_TRUE(init->InitiateMerge()); ASSERT_TRUE(init->InitiateMerge());
ASSERT_EQ(UpdateState::MergeCompleted, init->ProcessUpdateState()); ASSERT_EQ(UpdateState::MergeCompleted, init->ProcessUpdateState());