ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "dump stack before kill all" am: c13a2da2f4 am: 4e24aa2bc3

Browse source 
am: 2b33d96db1

Change-Id: Ic9c86ce7ddf8591a9fb2d3b1cdf72057c21d4111
This commit is contained in:
Keun-young Park 2017-07-19 22:29:51 +00:00 • committed by android-build-merger
commit f0a13c35f2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/reboot.cpp
View file

@ -323,11 +323,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, std::chrono::milliseconds timeo
UmountStat stat = UmountPartitions(timeout - t.duration()); UmountStat stat = UmountPartitions(timeout - t.duration());
if (stat != UMOUNT_STAT_SUCCESS) { if (stat != UMOUNT_STAT_SUCCESS) {
LOG(INFO) << "umount timeout, last resort, kill all and try"; 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(); KillAllProcesses();
// even if it succeeds, still it is timeout and do not run fsck with all processes killed // even if it succeeds, still it is timeout and do not run fsck with all processes killed
UmountPartitions(0ms); UmountStat st = UmountPartitions(0ms);
if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true); if ((st != UMOUNT_STAT_SUCCESS) && DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);
} }
if (stat == UMOUNT_STAT_SUCCESS && runFsck) { if (stat == UMOUNT_STAT_SUCCESS && runFsck) {