commit 55329af42fc931014d33729bc28f667508aeeaf8
author Keun-young Park <keunyoung@google.com> Tue Jul 18 18:52:25 2017 -0700
committer Keun-young Park <keunyoung@google.com> Wed Jul 19 17:11:36 2017 -0700
tree 6f96310f098c2c579144ad8441789ac493ee89ba
parent 791663f3e8f3b6d752b9a511624a309463821032

dump stack before kill all

- If problematic process is from user, kill all kills
  it and dump does not show problematic process.

bug: 37737296
Test: reboot and check log

Merged-In: Iaa4f7d12f5a40fa7528c6672567c36e30b140372
Change-Id: Iaa4f7d12f5a40fa7528c6672567c36e30b140372

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 1235d53..e4c5354 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -287,11 +287,11 @@
     UmountStat stat = UmountPartitions(timeoutMs - t.duration_ms());
     if (stat != UMOUNT_STAT_SUCCESS) {
         LOG(INFO) << "umount timeout, last resort, kill all and try";
-        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);
+        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);
         KillAllProcesses();
         // even if it succeeds, still it is timeout and do not run fsck with all processes killed
-        UmountPartitions(0);
-        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);
+        UmountStat st = UmountPartitions(0);
+        if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);
     }
 
     if (stat == UMOUNT_STAT_SUCCESS && runFsck) {