Snap for 7739396 from 5e9708644c304825d64b851861ef54e77d05c737 to sc-v2-release (436e0a22) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapshot.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -1456,7 +1456,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);
		@@ -1513,8 +1513,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;
		}

+11 −1

Original line number	Diff line number	Diff line
		@@ -2071,14 +2071,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());