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

Commit 28a2c921 authored by Jonglin Lee's avatar Jonglin Lee
Browse files

init: dump less debug logs when unmount timeout 

Dump only uninterruptible tasks instead of all tasks when
unmount timeout. Also dump current CPU stack traces.

Bug: 122858312
Test: Reboot with and without timeout
Change-Id: I1412ace022b6d78e25fbe1337d1082d4be9c19c0
parent c8b83f38

init/reboot.cpp

+6 −7
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions, 
    return true;

}



static void DumpUmountDebuggingInfo(bool dump_all) {

static void DumpUmountDebuggingInfo() {

    int status;

    if (!security_getenforce()) {

        LOG(INFO) << "Run lsof";
@@ -198,10 +198,9 @@ static void DumpUmountDebuggingInfo(bool dump_all) { 
                                true, nullptr, nullptr, 0);

    }

    FindPartitionsToUmount(nullptr, nullptr, true);

    if (dump_all) {

        // dump current tasks, this log can be lengthy, so only dump with dump_all

        android::base::WriteStringToFile("t", "/proc/sysrq-trigger");

    }

    // dump current CPU stack traces and uninterruptible tasks

    android::base::WriteStringToFile("l", "/proc/sysrq-trigger");

    android::base::WriteStringToFile("w", "/proc/sysrq-trigger");

}



static UmountStat UmountPartitions(std::chrono::milliseconds timeout) {
@@ -264,11 +263,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, std::chrono::milliseconds timeo 
    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(true);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo();

        KillAllProcesses();

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

        UmountStat st = UmountPartitions(0ms);

        if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

        if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo();

    }



    if (stat == UMOUNT_STAT_SUCCESS && runFsck) {