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

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

Merge "init: Avoid killing all processes during reboot if update is in... 

Merge "init: Avoid killing all processes during reboot if update is in progress" am: 717ee912 am: f4e4e6e6 am: 5bf79d0f

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



Change-Id: I7b00c1d51870de26eecbc31bc8fc789d2c8749b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b0a3e8d 5bf79d0f

fs_mgr/libsnapshot/include/libsnapshot/snapshot.h

+4 −0
Original line number Diff line number Diff line
@@ -395,6 +395,10 @@ class SnapshotManager final : public ISnapshotManager { 
    // first-stage to decide whether to launch snapuserd.

    bool IsSnapuserdRequired();



    // This is primarily used to device reboot. If OTA update is in progress,

    // init will avoid killing processes

    bool IsUserspaceSnapshotUpdateInProgress();



    enum class SnapshotDriver {

        DM_SNAPSHOT,

        DM_USER,

fs_mgr/libsnapshot/snapshot.cpp

+11 −0
Original line number Diff line number Diff line
@@ -4349,5 +4349,16 @@ std::string SnapshotManager::ReadSourceBuildFingerprint() { 
    return status.source_build_fingerprint();

}



bool SnapshotManager::IsUserspaceSnapshotUpdateInProgress() {

    auto slot = GetCurrentSlot();

    if (slot == Slot::Target) {

        if (IsSnapuserdRequired()) {

            return true;

        }

    }



    return false;

}



}  // namespace snapshot

}  // namespace android

init/reboot.cpp

+22 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <bootloader_message/bootloader_message.h>

#include <cutils/android_reboot.h>

#include <fs_mgr.h>

#include <libsnapshot/snapshot.h>

#include <logwrap/logwrap.h>

#include <private/android_filesystem_config.h>

#include <selinux/selinux.h>
@@ -422,11 +423,31 @@ static UmountStat TryUmountAndFsck(unsigned int cmd, bool run_fsck, 
    if (run_fsck && !FindPartitionsToUmount(&block_devices, &emulated_devices, false)) {

        return UMOUNT_STAT_ERROR;

    }



    auto sm = snapshot::SnapshotManager::New();

    bool ota_update_in_progress = false;

    if (sm->IsUserspaceSnapshotUpdateInProgress()) {

        LOG(INFO) << "OTA update in progress";

        ota_update_in_progress = true;

    }

    UmountStat stat = UmountPartitions(timeout - t.duration());

    if (stat != UMOUNT_STAT_SUCCESS) {

        LOG(INFO) << "umount timeout, last resort, kill all and try";

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo();

        // Since umount timedout, we will try to kill all processes

        // and do one more attempt to umount the partitions.

        //

        // However, if OTA update is in progress, we don't want

        // to kill the snapuserd daemon as the daemon will

        // be serving I/O requests. Killing the daemon will

        // end up with I/O failures. If the update is in progress,

        // we will just return the umount failure status immediately.

        // This is ok, given the fact that killing the processes

        // and doing an umount is just a last effort. We are

        // still not doing fsck when all processes are killed.

        //

        if (ota_update_in_progress) {

            return stat;

        }

        KillAllProcesses();

        // even if it succeeds, still it is timeout and do not run fsck with all processes killed

        UmountStat st = UmountPartitions(0ms);