Minor fixes.

Signed-off-by: Kevin Baichoo <kbaichoo@google.com>
envoyproxy · Oct 13, 2020 · 931b0e7 · 931b0e7
1 parent 3b8841c
commit 931b0e7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/api/envoy/watchdog/abort_action/v3alpha/abort_action.proto b/api/envoy/watchdog/abort_action/v3alpha/abort_action.proto
@@ -15,7 +15,6 @@ option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Watchdog Action that kills a stuck thread to kill the process.]
-// [#extension: envoy.watchdog.abort_action]
 
 // A GuardDogAction that will terminate the process by killing the
 // stuck thread. This would allow easier access to the call stack of the stuck

diff --git a/docs/root/api-v3/config/watchdog/watchdog.rst b/docs/root/api-v3/config/watchdog/watchdog.rst
@@ -6,4 +6,4 @@ Watchdog
   :maxdepth: 2
 
   ../../extensions/watchdog/profile_action/v3alpha/*
-  ../../extensions/watchdog/abort_action/v3alpha/*
+  ../../watchdog/abort_action/v3alpha/*
diff --git a/source/common/thread/BUILD b/source/common/thread/BUILD
@@ -14,5 +14,6 @@ envoy_cc_library(
     hdrs = ["terminate_thread.h"],
     deps = [
         "//include/envoy/thread:thread_interface",
+        "//source/common/common:minimal_logger_lib",
     ],
 )
diff --git a/source/common/thread/terminate_thread.cc b/source/common/thread/terminate_thread.cc
@@ -4,6 +4,8 @@
 
 #include <csignal>
 
+#include "common/common/logger.h"
+
 namespace Envoy {
 namespace Thread {
 namespace {

diff --git a/test/server/server_test.cc b/test/server/server_test.cc
@@ -1327,7 +1327,7 @@ TEST_P(ServerInstanceImplTest, UsesAbortActionOnWatchdogKill) {
         // Wait for the sleep to run, we should die by the watchdog by then.
         main_thread_slept.WaitForNotification();
       },
-      "Caught Aborted");
+      "(ABRT|Caught Abort)");
 }
 
 } // namespace