From ef9d460ea8e6b476ceca0769d6451f8466544484 Mon Sep 17 00:00:00 2001 From: Woody Lin Date: Wed, 20 Jan 2021 12:28:33 +0800 Subject: [PATCH] Add init.svc_debug.no_fatal. to skip SVC_CRITICAL For user who would like to retain the crash symptom and avoid device from power cycle for live debugging, set init.svc_debug.no_fatal. to "true" to skip FATAL reboot. Bug: 177593855 Change-Id: I0bdb6191e5963c08e1ea301a60060acf916dd49b --- init/README.md | 2 ++ init/service.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/init/README.md b/init/README.md index bcbbfbbd4..67d55e1f6 100644 --- a/init/README.md +++ b/init/README.md @@ -178,6 +178,8 @@ runs the service. will reboot into _fatal reboot target_. The default value of _fatal crash window mins_ is 4, and default value of _fatal reboot target_ is 'bootloader'. + For tests, the fatal reboot can be skipped by setting property + `init.svc_debug.no_fatal.` to `true` for specified critical service. `disabled` > This service will not automatically start with its class. diff --git a/init/service.cpp b/init/service.cpp index d84dcd431..f6ce094ef 100644 --- a/init/service.cpp +++ b/init/service.cpp @@ -52,6 +52,7 @@ #endif using android::base::boot_clock; +using android::base::GetBoolProperty; using android::base::GetProperty; using android::base::Join; using android::base::make_scope_guard; @@ -318,17 +319,19 @@ void Service::Reap(const siginfo_t& siginfo) { // reboot into bootloader or set crashing property boot_clock::time_point now = boot_clock::now(); if (((flags_ & SVC_CRITICAL) || is_process_updatable) && !(flags_ & SVC_RESTART)) { - bool boot_completed = android::base::GetBoolProperty("sys.boot_completed", false); + bool boot_completed = GetBoolProperty("sys.boot_completed", false); if (now < time_crashed_ + fatal_crash_window_ || !boot_completed) { if (++crash_count_ > 4) { auto exit_reason = boot_completed ? "in " + std::to_string(fatal_crash_window_.count()) + " minutes" : "before boot completed"; if (flags_ & SVC_CRITICAL) { - // Aborts into `fatal_reboot_target_'. - SetFatalRebootTarget(fatal_reboot_target_); - LOG(FATAL) << "critical process '" << name_ << "' exited 4 times " - << exit_reason; + if (!GetBoolProperty("init.svc_debug.no_fatal." + name_, false)) { + // Aborts into `fatal_reboot_target_'. + SetFatalRebootTarget(fatal_reboot_target_); + LOG(FATAL) << "critical process '" << name_ << "' exited 4 times " + << exit_reason; + } } else { LOG(ERROR) << "process with updatable components '" << name_ << "' exited 4 times " << exit_reason;