summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2021-06-23 06:24:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-23 06:24:14 +0000
commit61ff7e6bc9ba3ba3b7e176df13990021f9211ee3 (patch)
tree9b0e25b1a12515fba3598ff96802fdf83f254758
parentc6f31395d48c4574f92f8a94d2e4b43f33eb2725 (diff)
parent8449fac88ee70e329d856377a85456d27f2eef35 (diff)
downloadnetd-61ff7e6bc9ba3ba3b7e176df13990021f9211ee3.tar.gz
make failing to start TrafficController critical. am: 8449fac88e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/15072884 Change-Id: Ice5cb3bedf3138087dc582d2d8ddb336c2ca876a
-rw-r--r--server/Controllers.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/Controllers.cpp b/server/Controllers.cpp
index 7e2780f0..1f2bac22 100644
--- a/server/Controllers.cpp
+++ b/server/Controllers.cpp
@@ -285,6 +285,12 @@ void Controllers::init() {
netdutils::Status tcStatus = trafficCtrl.start();
if (!isOk(tcStatus)) {
gLog.error("Failed to start trafficcontroller: (%s)", toString(tcStatus).c_str());
+ gLog.error("CRITICAL: sleeping 60 seconds, netd exiting with failure, crash loop likely!");
+ // The expected reason we get here is a major kernel or other code bug, as such
+ // the probability that things will succeed on restart of netd is pretty small.
+ // So, let's wait a minute to at least try to limit the log spam a little bit.
+ sleep(60);
+ exit(1);
}
gLog.info("Initializing traffic control: %" PRId64 "us", s.getTimeAndResetUs());