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

Commit a0702978 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Remove invalid snapshot metadata" am: e3cca4a0 am:... 

Merge "libsnapshot: Remove invalid snapshot metadata" am: e3cca4a0 am: d2611d1c am: 0d701c13 am: 071d7505

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



Change-Id: Id7a8a01743c000febd1ea69a448d120146d7a3f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2ad359e 071d7505

fs_mgr/libsnapshot/include/libsnapshot/snapshot.h

+3 −0
Original line number Diff line number Diff line
@@ -538,6 +538,9 @@ class SnapshotManager final : public ISnapshotManager { 
    // Unmap a COW and remove it from a MetadataBuilder.

    void UnmapAndDeleteCowPartition(MetadataBuilder* current_metadata);



    // Remove invalid snapshots if any

    void RemoveInvalidSnapshots(LockedFile* lock);



    // Unmap and remove all known snapshots.

    bool RemoveAllSnapshots(LockedFile* lock);

fs_mgr/libsnapshot/snapshot.cpp

+31 −1
Original line number Diff line number Diff line
@@ -218,7 +218,10 @@ bool SnapshotManager::TryCancelUpdate(bool* needs_merge) { 
    if (!file) return false;



    UpdateState state = ReadUpdateState(file.get());

    if (state == UpdateState::None) return true;

    if (state == UpdateState::None) {

        RemoveInvalidSnapshots(file.get());

        return true;

    }



    if (state == UpdateState::Initiated) {

        LOG(INFO) << "Update has been initiated, now canceling";
@@ -1903,6 +1906,33 @@ bool SnapshotManager::GetSnapshotFlashingStatus(LockedFile* lock, 
    return true;

}



void SnapshotManager::RemoveInvalidSnapshots(LockedFile* lock) {

    std::vector<std::string> snapshots;



    // Remove the stale snapshot metadata

    //

    // We make sure that all the three cases

    // are valid before removing the snapshot metadata:

    //

    // 1: dm state is active

    // 2: Root fs is not mounted off as a snapshot device

    // 3: Snapshot slot suffix should match current device slot

    if (!ListSnapshots(lock, &snapshots, device_->GetSlotSuffix()) || snapshots.empty()) {

        return;

    }



    // We indeed have some invalid snapshots

    for (const auto& name : snapshots) {

        if (dm_.GetState(name) == DmDeviceState::ACTIVE && !IsSnapshotDevice(name)) {

            if (!DeleteSnapshot(lock, name)) {

                LOG(ERROR) << "Failed to delete invalid snapshot: " << name;

            } else {

                LOG(INFO) << "Invalid snapshot: " << name << " deleted";

            }

        }

    }

}



bool SnapshotManager::RemoveAllSnapshots(LockedFile* lock) {

    std::vector<std::string> snapshots;

    if (!ListSnapshots(lock, &snapshots)) {

init/init.cpp

+4 −0
Original line number Diff line number Diff line
@@ -826,6 +826,10 @@ int SecondStageMain(int argc, char** argv) { 
        InstallRebootSignalHandlers();

    }



    // No threads should be spin up until signalfd

    // is registered. If the threads are indeed required,

    // each of these threads _should_ make sure SIGCHLD signal

    // is blocked. See b/223076262

    boot_clock::time_point start_time = boot_clock::now();



    trigger_shutdown = [](const std::string& command) { shutdown_state.TriggerShutdown(command); };