exclude timeout and oom kills when measuring goodput

Reviewed By: jtwarren

Differential Revision: D71139470

fbshipit-source-id: 490efff7ce83b238de3f2bbe69c85ba405b0e0f1

Author: Bin Liu

hphp/runtime/base/execution-context-inl.h

@@ -212,6 +212,22 @@ inline void ExecutionContext::setSandboxId(const String& sandboxId) {
   m_sandboxId = sandboxId;
 }
 
+inline void ExecutionContext::markTimedOut() {
+  m_timedOut = true;
+}
+
+inline bool ExecutionContext::isTimedOut() const {
+  return m_timedOut;
+}
+
+inline void ExecutionContext::markOOMKilled() {
+  m_killed = true;
+}
+
+inline bool ExecutionContext::isOOMKilled() const {
+  return m_killed;
+}
+
 inline bool ExecutionContext::hasRequestEventHandlers() const {
   return !m_requestEventHandlers.empty();
 }

hphp/runtime/base/execution-context.cpp

@@ -714,7 +714,7 @@ void ExecutionContext::onShutdownPostSend() {
       executeFunctions(PostSend);
     } catch (...) {
       try {
-        bump_counter_and_rethrow(true /* isPsp */);
+        bump_counter_and_rethrow(true /* isPsp */, this);
       } catch (const ExitException&) {
         // do nothing
       } catch (const Exception& e) {
@@ -734,8 +734,8 @@ void ExecutionContext::onShutdownPostSend() {
 // error handling
 
 bool ExecutionContext::errorNeedsHandling(int errnum,
-                                              bool callUserHandler,
-                                              ErrorThrowMode mode) {
+                                          bool callUserHandler,
+                                          ErrorThrowMode mode) {
   if (UNLIKELY(m_throwAllErrors)) {
     throw Exception(folly::sformat("throwAllErrors: {}", errnum));
   }
@@ -914,15 +914,15 @@ bool ExecutionContext::callUserErrorHandler(const Exception& e, int errnum,
                                         {ServiceData::StatsType::COUNT});
       requestErrorHandlerTimeoutCounter->addValue(1);
       ServerStats::Log("request.timed_out.error_handler", 1);
-
+      markTimedOut();
       if (!swallowExceptions) throw;
     } catch (const RequestCPUTimeoutException&) {
       static auto requestErrorHandlerCPUTimeoutCounter =
           ServiceData::createTimeSeries("requests_cpu_timed_out_error_handler",
                                         {ServiceData::StatsType::COUNT});
       requestErrorHandlerCPUTimeoutCounter->addValue(1);
       ServerStats::Log("request.cpu_timed_out.error_handler", 1);
-
+      markTimedOut();
       if (!swallowExceptions) throw;
     } catch (const RequestMemoryExceededException&) {
       static auto requestErrorHandlerMemoryExceededCounter =

hphp/runtime/base/execution-context.h

@@ -349,6 +349,14 @@ struct ExecutionContext {
   // options.
   void onLoadWithOptions(const char* f, const RepoOptions& options);
 
+  // Check if request timed out (e.g., due to overload)
+  void markTimedOut();
+  bool isTimedOut() const;
+
+  // Check if request got killed by the request OOM killer.
+  void markOOMKilled();
+  bool isOOMKilled() const;
+
 private:
   struct OutputBuffer {
     explicit OutputBuffer(Variant&& h, int chunk_sz, OBFlags flgs)
@@ -561,6 +569,8 @@ struct ExecutionContext {
   req::list<OutputBuffer> m_buffers; // a stack of output buffers
   bool m_insideOBHandler{false};
   bool m_implicitFlush;
+  bool m_timedOut{false};
+  bool m_killed{false};
   int m_protectedLevel;
 
   // Debugger stdout hook is treated differently. If it is non-null,

hphp/runtime/base/program-functions.cpp

@@ -474,7 +474,7 @@ static void handle_exception_append_bt(std::string& errorMsg,
   }
 }
 
-void bump_counter_and_rethrow(bool isPsp) {
+void bump_counter_and_rethrow(bool isPsp, ExecutionContext* context) {
   try {
     throw;
   } catch (const RequestTimeoutException&) {
@@ -489,6 +489,7 @@ void bump_counter_and_rethrow(bool isPsp) {
       requestTimeoutCounter->addValue(1);
       ServerStats::Log("request.timed_out.non_psp", 1);
     }
+    context->markTimedOut();
     throw;
   } catch (const RequestCPUTimeoutException&) {
     if (isPsp) {
@@ -502,6 +503,7 @@ void bump_counter_and_rethrow(bool isPsp) {
       requestCPUTimeoutCounter->addValue(1);
       ServerStats::Log("request.cpu_timed_out.non_psp", 1);
     }
+    context->markTimedOut();
     throw;
   } catch (const RequestMemoryExceededException&) {
     if (isPsp) {
@@ -533,11 +535,10 @@ void bump_counter_and_rethrow(bool isPsp) {
       StructuredLogEntry entry;
       entry.setInt("mem_used", e.m_usedBytes);
       entry.setInt("is_psp", static_cast<int>(isPsp));
-      if (g_context) {
-        entry.setStr("url", g_context->getRequestUrl());
-      }
+      entry.setStr("url", context->getRequestUrl());
       StructuredLog::log("hhvm_oom_killed", entry);
     }
+    context->markOOMKilled();
     throw;
   }
 }
@@ -557,7 +558,7 @@ static void handle_exception_helper(bool& ret,
   };
 
   try {
-    bump_counter_and_rethrow(false /* isPsp */);
+    bump_counter_and_rethrow(false /* isPsp */, context);
   } catch (const Eval::DebuggerException&) {
     throw;
   } catch (const ExitException& e) {

hphp/runtime/base/program-functions.h

@@ -128,7 +128,7 @@ bool is_hphp_session_initialized();
 std::string get_embedded_section(const std::string& section_name);
 
 // Helper function for stats tracking with exceptions.
-void bump_counter_and_rethrow(bool isPsp);
+void bump_counter_and_rethrow(bool isPsp, ExecutionContext* context);
 
 std::vector<int> get_executable_lines(const Unit*);