[trafficserver] branch master updated: We should call handle_parent_died if we failed to find next parent

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall 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 df0ad83  We should call handle_parent_died if we failed to find next parent
df0ad83 is described below

commit df0ad832446325c4ea222ee594ed0f2231617b87
Author: scw00 <sc...@apache.org>
AuthorDate: Sat Jan 27 10:00:28 2018 +0800

    We should call handle_parent_died if we failed to find next parent
---
 proxy/http/HttpTransact.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index ce78934..f174cda 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1436,7 +1436,12 @@ HttpTransact::PPDNSLookup(State *s)
     HTTP_INCREMENT_DYN_STAT(http_total_parent_marked_down_count);
     s->parent_params->markParentDown(&s->parent_result, s->txn_conf->parent_fail_threshold, s->txn_conf->parent_retry_time);
     // DNS lookup of parent failed, find next parent or o.s.
-    find_server_and_update_current_info(s);
+    if (find_server_and_update_current_info(s) == HttpTransact::HOST_NONE) {
+      ink_assert(s->current.request_to == HOST_NONE);
+      handle_parent_died(s);
+      return;
+    }
+
     if (!s->current.server->dst_addr.isValid()) {
       if (s->current.request_to == PARENT_PROXY) {
         TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, PPDNSLookup);

-- 
To stop receiving notification emails like this one, please contact
bcall@apache.org.