commit 3079adbff83773fd8ead203addc65fa4b87ac4e0
author Jonglin Lee <jonglin@google.com> Thu Jan 17 15:03:21 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 17 15:03:21 2019 -0800
tree bd14a3b041f000ccf5840ca8f757183aac366dd4
parent 9b4f00069a1e9572c1c3dad9da6ff32790558d02
parent 08d151d9e13b0543ac436e2229783cffca2d6f0d

Merge "init: dump less debug logs when unmount timeout"
am: 1945fbef10

Change-Id: I78380e8ed273612698da63391c0c7bb103bed806

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index c11ea10..0aa7810 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -196,7 +196,7 @@
     return true;
 }
 
-static void DumpUmountDebuggingInfo(bool dump_all) {
+static void DumpUmountDebuggingInfo() {
     int status;
     if (!security_getenforce()) {
         LOG(INFO) << "Run lsof";
@@ -205,10 +205,9 @@
                                 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) {
@@ -271,11 +270,11 @@
     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) {