trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [trafficserver] branch master updated: Set milestone for first connect before returning in the PluginVC case. (#8086)
Date Mon, 19 Jul 2021 23:49:05 GMT
This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new ea5be6f  Set milestone for first connect before returning in the PluginVC case. (#8086)
ea5be6f is described below

commit ea5be6f04c2a087f0581f4cb2c67f693c7ff71f6
Author: Jeff Elsloo <elsloo@users.noreply.github.com>
AuthorDate: Mon Jul 19 17:48:54 2021 -0600

    Set milestone for first connect before returning in the PluginVC case. (#8086)
---
 proxy/http/HttpSM.cc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 1850558..f45a902 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -4992,6 +4992,14 @@ HttpSM::do_http_server_open(bool raw)
   SMDebug("http", "[%" PRId64 "] open connection to %s: %s", sm_id, t_state.current.server->name,
           ats_ip_nptop(&t_state.current.server->dst_addr.sa, addrbuf, sizeof(addrbuf)));
 
+  SMDebug("http_seq", "[HttpSM::do_http_server_open] Sending request to server");
+
+  // set the server first connect milestone here in case we return in the plugin_tunnel case
that follows
+  milestones[TS_MILESTONE_SERVER_CONNECT] = Thread::get_hrtime();
+  if (milestones[TS_MILESTONE_SERVER_FIRST_CONNECT] == 0) {
+    milestones[TS_MILESTONE_SERVER_FIRST_CONNECT] = milestones[TS_MILESTONE_SERVER_CONNECT];
+  }
+
   if (plugin_tunnel) {
     PluginVCCore *t           = plugin_tunnel;
     plugin_tunnel             = nullptr;
@@ -5002,13 +5010,6 @@ HttpSM::do_http_server_open(bool raw)
     return;
   }
 
-  SMDebug("http_seq", "[HttpSM::do_http_server_open] Sending request to server");
-
-  milestones[TS_MILESTONE_SERVER_CONNECT] = Thread::get_hrtime();
-  if (milestones[TS_MILESTONE_SERVER_FIRST_CONNECT] == 0) {
-    milestones[TS_MILESTONE_SERVER_FIRST_CONNECT] = milestones[TS_MILESTONE_SERVER_CONNECT];
-  }
-
   // Check for remap rule. If so, only apply ip_allow filter if it is activated (ip_allow_check_enabled_p
set).
   // Otherwise, if no remap rule is defined, apply the ip_allow filter.
   if (!t_state.url_remap_success || t_state.url_map.getMapping()->ip_allow_check_enabled_p)
{

Mime
View raw message