[trafficserver] branch 9.0.x updated: Reset captive_action.cancelled during open read retry to prevent assert

[zw...@apache.org]

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

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new c3d3413  Reset captive_action.cancelled during open read retry to prevent assert
c3d3413 is described below

commit c3d3413a50b3e9f164c9ed4d82a27725bcd7ce1b
Author: Sudheer Vinukonda <su...@apache.org>
AuthorDate: Tue Feb 18 14:48:51 2020 -0800

    Reset captive_action.cancelled during open read retry to prevent assert
    
    (cherry picked from commit 0f1f028d0e0e562bc88027408cbf68b5299b6b8b)
---
 proxy/http/HttpCacheSM.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proxy/http/HttpCacheSM.cc b/proxy/http/HttpCacheSM.cc
index 25b9e21..e92d734 100644
--- a/proxy/http/HttpCacheSM.cc
+++ b/proxy/http/HttpCacheSM.cc
@@ -266,6 +266,8 @@ HttpCacheSM::do_cache_open_read(const HttpCacheKey &key)
   } else {
     ink_assert(open_read_cb == false);
   }
+  // reset captive_action since HttpSM cancelled it during open read retry
+  captive_action.cancelled = 0;
   // Initialising read-while-write-inprogress flag
   this->readwhilewrite_inprogress = false;
   Action *action_handle = cacheProcessor.open_read(this, &key, this->read_request_hdr, this->http_params, this->read_pin_in_cache);