Snap for 7486544 from 8449fac88ee70e329d856377a85456d27f2eef35 to sc-release

Change-Id: I36d35b7042daec798b41e46b4ad6c542fbb706f1

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());