Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 819e302a authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Fix new partitions not transitioning in second-stage init." am: 4d18ab25 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1817816

Change-Id: Ie98dac109e849facedecca7e51f9a902b31a6f79
parents 3a0d176e 4d18ab25

fs_mgr/libsnapshot/snapshot.cpp

+9 −2
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ bool SnapshotManager::PerformInitTransition(InitTransition transition, 
                                            std::vector<std::string>* snapuserd_argv) {

    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.

    if (!snapuserd_client_ && transition != InitTransition::SELINUX_DETACH) {

        snapuserd_client_ = SnapuserdClient::Connect(kSnapuserdSocket, 10s);
@@ -1509,8 +1509,15 @@ bool SnapshotManager::PerformInitTransition(InitTransition transition, 
            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;

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

            continue;

        }

fs_mgr/libsnapshot/snapshot_test.cpp

+11 −1
Original line number Diff line number Diff line
@@ -2118,14 +2118,24 @@ TEST_F(SnapshotUpdateTest, AddPartition) { 
    // After reboot, init does first stage mount.

    auto init = NewManagerForFirstStageMount("_b");

    ASSERT_NE(init, nullptr);



    ASSERT_TRUE(init->EnsureSnapuserdConnected());

    init->set_use_first_stage_snapuserd(true);



    ASSERT_TRUE(init->NeedSnapshotsInFirstStageMount());

    ASSERT_TRUE(init->CreateLogicalAndSnapshotPartitions("super", snapshot_timeout_));



    // 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(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.

    ASSERT_TRUE(init->InitiateMerge());

    ASSERT_EQ(UpdateState::MergeCompleted, init->ProcessUpdateState());