TS-2944: remove proxy.config.http.record_tcp_mem_hit

Remove proxy.config.http.record_tcp_mem_hit and always record RAM cache hits. This configuration was not useful, since the work of figuring out whether it is a RAM cache hit is always done.
BundesIT · Jul 20, 2014 · 2042a17 · 2042a17
1 parent 37b6b58
commit 2042a17
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 17 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.1.0
 
+  *) [TS-2944] Remove the proxy.config.http.record_tcp_mem_hit configuration variable.
+
   *) [TS-2924] Configurable client's ssl protocols and cipher suite
 
   *) [TS-2915] SEGV occurs when POST request was posted without Expect: 100-continue header

diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -536,7 +536,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
  proxy.config.http.push_method_enabled
  proxy.config.http.quick_filter.mask
  proxy.config.http.record_heartbeat
- proxy.config.http.record_tcp_mem_hit
  proxy.config.http.redirection_enabled
  proxy.config.http.referer_default_redirect
  proxy.config.http.referer_filter

diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
@@ -441,8 +441,6 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.http.record_heartbeat", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.record_tcp_mem_hit", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.http.default_buffer_size", RECD_INT, "8", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.http.default_buffer_water_mark", RECD_INT, "32768", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}

diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
@@ -1423,8 +1423,6 @@ HttpConfig::startup()
 
   HttpEstablishStaticConfigByte(c.record_cop_page, "proxy.config.http.record_heartbeat");
 
-  HttpEstablishStaticConfigByte(c.record_tcp_mem_hit, "proxy.config.http.record_tcp_mem_hit");
-
   HttpEstablishStaticConfigByte(c.oride.send_http11_requests, "proxy.config.http.send_http11_requests");
 
   // HTTP Referer Filtering
@@ -1668,7 +1666,6 @@ params->push_method_enabled = INT_TO_BOOL(m_master.push_method_enabled);
   params->errors_log_error_pages = INT_TO_BOOL(m_master.errors_log_error_pages);
   params->slow_log_threshold = m_master.slow_log_threshold;
   params->record_cop_page = INT_TO_BOOL(m_master.record_cop_page);
-  params->record_tcp_mem_hit = INT_TO_BOOL(m_master.record_tcp_mem_hit);
   params->oride.send_http11_requests = m_master.oride.send_http11_requests;
   params->oride.doc_in_cache_skip_dns = INT_TO_BOOL(m_master.oride.doc_in_cache_skip_dns);
   params->oride.default_buffer_size_index = m_master.oride.default_buffer_size_index;

diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
@@ -738,11 +738,6 @@ struct HttpConfigParams:public ConfigInfo
   ///////////////////
   MgmtByte record_cop_page;
 
-  ////////////////////////
-  // record tcp_mem_hit //
-  ////////////////////////
-  MgmtByte record_tcp_mem_hit;
-
   /////////////////////
   // Error Reporting //
   /////////////////////
@@ -915,8 +910,6 @@ HttpConfigParams::HttpConfigParams()
     referer_format_redirect(0),
     reverse_proxy_enabled(0),
     url_remap_required(1),
-    record_cop_page(0),
-    record_tcp_mem_hit(0),
     errors_log_error_pages(1),
     enable_http_info(0),
     cluster_time_delta(0),

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
@@ -2350,8 +2350,7 @@ HttpSM::state_cache_open_write(int event, void *data)
     // The write vector was locked and the cache_sm retried
     // and got the read vector again.
     cache_sm.cache_read_vc->get_http_info(&t_state.cache_info.object_read);
-    t_state.cache_info.is_ram_cache_hit =
-      t_state.http_config_param->record_tcp_mem_hit && (cache_sm.cache_read_vc)->is_ram_cache_hit();
+    t_state.cache_info.is_ram_cache_hit = (cache_sm.cache_read_vc)->is_ram_cache_hit();
 
     ink_assert(t_state.cache_info.object_read != 0);
     t_state.source = HttpTransact::SOURCE_CACHE;
@@ -2435,8 +2434,7 @@ HttpSM::state_cache_open_read(int event, void *data)
       t_state.source = HttpTransact::SOURCE_CACHE;
 
       cache_sm.cache_read_vc->get_http_info(&t_state.cache_info.object_read);
-      t_state.cache_info.is_ram_cache_hit =
-        t_state.http_config_param->record_tcp_mem_hit && (cache_sm.cache_read_vc)->is_ram_cache_hit();
+      t_state.cache_info.is_ram_cache_hit = (cache_sm.cache_read_vc)->is_ram_cache_hit();
 
       ink_assert(t_state.cache_info.object_read != 0);
       call_transact_and_set_next_state(HttpTransact::HandleCacheOpenRead);