Skip to content

http: funnel cache key generation through HttpSM #13557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakeChampion wants to merge 1 commit into
base: master
Choose a base branch
from
Open

http: funnel cache key generation through HttpSM #13557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/proxy/http/HttpSM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ class HttpSM : public Continuation, public PluginUserArgs<TS_USER_ARGS_TXN>
void do_drain_request_body(HTTPHdr &response);

void wait_for_full_body();
void generate_cache_key(HttpCacheKey *key, URL *url, bool compat = false);

virtual void handle_api_return();
void handle_server_setup_error(int event, void *data);
Expand Down
21 changes: 13 additions & 8 deletions src/proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,16 @@ HttpSM::wait_for_full_body()
tunnel.tunnel_run(p);
}

void
HttpSM::generate_cache_key(HttpCacheKey *key, URL *url, bool compat)
{
if (compat) {
Cache::generate_key92(key, url, t_state.txn_conf->cache_ignore_query, t_state.txn_conf->cache_generation_number);
} else {
Cache::generate_key(key, url, t_state.txn_conf->cache_ignore_query, t_state.txn_conf->cache_generation_number);
}
}

int
HttpSM::state_watch_for_client_abort(int event, void *data)
{
Expand Down Expand Up @@ -5327,11 +5337,7 @@ HttpSM::do_cache_lookup_and_read()
SMDbg(dbg_ctl_http_seq, "Issuing cache lookup for URL %s", c_url->string_get(&t_state.arena));

HttpCacheKey key;
if (compatibility_cache_lookup == CompatibilityCacheLookup::COMPAT_CACHE_LOOKUP_92) {
Cache::generate_key92(&key, c_url, t_state.txn_conf->cache_ignore_query, t_state.txn_conf->cache_generation_number);
} else {
Cache::generate_key(&key, c_url, t_state.txn_conf->cache_ignore_query, t_state.txn_conf->cache_generation_number);
}
generate_cache_key(&key, c_url, compatibility_cache_lookup == CompatibilityCacheLookup::COMPAT_CACHE_LOOKUP_92);

t_state.hdr_info.cache_request.copy(&t_state.hdr_info.client_request);
HttpTransactHeaders::normalize_accept_encoding(t_state.txn_conf, &t_state.hdr_info.cache_request);
Expand All @@ -5358,8 +5364,7 @@ HttpSM::do_cache_delete_all_alts()
SMDbg(dbg_ctl_http_seq, "Issuing cache delete for %s", t_state.cache_info.lookup_url->string_get_ref());

HttpCacheKey key;
Cache::generate_key(&key, t_state.cache_info.lookup_url, t_state.txn_conf->cache_ignore_query,
t_state.txn_conf->cache_generation_number);
generate_cache_key(&key, t_state.cache_info.lookup_url);
cacheProcessor.remove(nullptr, &key);
}

Expand Down Expand Up @@ -5436,7 +5441,7 @@ HttpSM::do_cache_prepare_action(HttpCacheSM *c_sm, CacheHTTPInfo *object_read_in
SMDbg(dbg_ctl_http_cache_write, "writing to cache with URL %s", s_url->string_get(&t_state.arena));

HttpCacheKey key;
Cache::generate_key(&key, s_url, t_state.txn_conf->cache_ignore_query, t_state.txn_conf->cache_generation_number);
generate_cache_key(&key, s_url);

pending_action =
c_sm->open_write(&key, s_url, &t_state.hdr_info.cache_request, object_read_info,
Expand Down