tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fallback to hard reboot if userspace reboot hasn't started in time"

Browse source
This commit is contained in:
Nikita Ioffe 2020-04-13 19:14:56 +00:00 committed by Gerrit Code Review
commit 1c14654732
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
init/reboot.cpp
View file

@ -838,20 +838,25 @@ static Result<void> DoUserspaceReboot() {
}
static void UserspaceRebootWatchdogThread() {
if (!WaitForProperty("sys.init.userspace_reboot.in_progress", "1", 20s)) {
// TODO(b/135984674): should we reboot instead?
LOG(WARNING) << "Userspace reboot didn't start in 20 seconds. Stopping watchdog";
return;
auto started_timeout = GetMillisProperty("init.userspace_reboot.started.timeoutmillis", 10s);
if (!WaitForProperty("sys.init.userspace_reboot.in_progress", "1", started_timeout)) {
LOG(ERROR) << "Userspace reboot didn't start in " << started_timeout.count()
<< "ms. Switching to full reboot";
// Init might be wedged, don't try to write reboot reason into a persistent property and do
// a dirty reboot.
PersistRebootReason("userspace_failed,watchdog_triggered,failed_to_start", false);
RebootSystem(ANDROID_RB_RESTART2, "userspace_failed,watchdog_triggered,failed_to_start");
}
LOG(INFO) << "Starting userspace reboot watchdog";
auto timeout = GetMillisProperty("init.userspace_reboot.watchdog.timeoutmillis", 5min);
LOG(INFO) << "UserspaceRebootWatchdog timeout: " << timeout.count() << "ms";
if (!WaitForProperty("sys.boot_completed", "1", timeout)) {
LOG(ERROR) << "Failed to boot in " << timeout.count() << "ms. Switching to full reboot";
auto watchdog_timeout = GetMillisProperty("init.userspace_reboot.watchdog.timeoutmillis", 5min);
LOG(INFO) << "UserspaceRebootWatchdog timeout: " << watchdog_timeout.count() << "ms";
if (!WaitForProperty("sys.boot_completed", "1", watchdog_timeout)) {
LOG(ERROR) << "Failed to boot in " << watchdog_timeout.count()
<< "ms. Switching to full reboot";
// In this case device is in a boot loop. Only way to recover is to do dirty reboot.
// Since init might be wedged, don't try to write reboot reason into a persistent property.
PersistRebootReason("userspace_failed,watchdog_triggered", false);
RebootSystem(ANDROID_RB_RESTART2, "userspace_failed,watchdog_triggered");
PersistRebootReason("userspace_failed,watchdog_triggered,failed_to_boot", false);
RebootSystem(ANDROID_RB_RESTART2, "userspace_failed,watchdog_triggered,failed_to_boot");
}
LOG(INFO) << "Device booted, stopping userspace reboot watchdog";
}