hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1486 When there is fresh data, update the cache entry

Browse Source 
If something is SELECTed that should be cached for some, but not
for the current user, the cached entry it nevertheless updated.
That way the cached data will always be the last fetched value
and it is also possible to use this behaviour for explicitly
updating the cache entry.
This commit is contained in:
Johan Wikman
2017-10-24 09:41:23 +03:00
parent 555aa6d2c8
commit efeaecaef2
2 changed files with 66 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
server/modules/filter/cache/cachefiltersession.cc vendored
View File

@ -291,73 +291,95 @@ int CacheFilterSession::routeQuery(GWBUF* pPacket)
{ {
if (m_pCache->should_store(m_zDefaultDb, pPacket)) if (m_pCache->should_store(m_zDefaultDb, pPacket))
{ {
if (m_pCache->should_use(m_pSession)) cache_result_t result = m_pCache->get_key(m_zDefaultDb, pPacket, &m_key);
if (CACHE_RESULT_IS_OK(result))
{ {
GWBUF* pResponse; if (m_pCache->should_use(m_pSession))
cache_result_t result = get_cached_response(pPacket, &pResponse);
if (CACHE_RESULT_IS_OK(result))
{ {
if (CACHE_RESULT_IS_STALE(result)) uint32_t flags = CACHE_FLAGS_INCLUDE_STALE;
GWBUF* pResponse;
result = m_pCache->get_value(m_key, flags, &pResponse);
if (CACHE_RESULT_IS_OK(result))
{ {
// The value was found, but it was stale. Now we need to if (CACHE_RESULT_IS_STALE(result))
// figure out whether somebody else is already fetching it.
if (m_pCache->must_refresh(m_key, this))
{ {
// We were the first ones who hit the stale item. It's // The value was found, but it was stale. Now we need to
// our responsibility now to fetch it. // figure out whether somebody else is already fetching it.
if (log_decisions())
if (m_pCache->must_refresh(m_key, this))
{ {
MXS_NOTICE("Cache data is stale, fetching fresh from server."); // We were the first ones who hit the stale item. It's
// our responsibility now to fetch it.
if (log_decisions())
{
MXS_NOTICE("Cache data is stale, fetching fresh from server.");
}
// As we don't use the response it must be freed.
gwbuf_free(pResponse);
m_refreshing = true;
fetch_from_server = true;
}
else
{
// Somebody is already fetching the new value. So, let's
// use the stale value. No point in hitting the server twice.
if (log_decisions())
{
MXS_NOTICE("Cache data is stale but returning it, fresh "
"data is being fetched already.");
}
fetch_from_server = false;
} }
// As we don't use the response it must be freed.
gwbuf_free(pResponse);
m_refreshing = true;
fetch_from_server = true;
} }
else else
{ {
// Somebody is already fetching the new value. So, let's
// use the stale value. No point in hitting the server twice.
if (log_decisions()) if (log_decisions())
{ {
MXS_NOTICE("Cache data is stale but returning it, fresh " MXS_NOTICE("Using fresh data from cache.");
"data is being fetched already.");
} }
fetch_from_server = false; fetch_from_server = false;
} }
} }
else else
{ {
if (log_decisions()) fetch_from_server = true;
{ }
MXS_NOTICE("Using fresh data from cache.");
} if (fetch_from_server)
fetch_from_server = false; {
m_state = CACHE_EXPECTING_RESPONSE;
}
else
{
m_state = CACHE_EXPECTING_NOTHING;
gwbuf_free(pPacket);
DCB *dcb = m_pSession->client_dcb;
// TODO: This is not ok. Any filters before this filter, will not
// TODO: see this data.
rv = dcb->func.write(dcb, pResponse);
} }
} }
else else
{ {
fetch_from_server = true; // We will not use any value in the cache, but we will update
} // the existing value.
if (log_decisions())
if (fetch_from_server) {
{ MXS_NOTICE("Unconditionally fetching data from the server, "
"refreshing cache entry.");
}
m_state = CACHE_EXPECTING_RESPONSE; m_state = CACHE_EXPECTING_RESPONSE;
} }
else }
{ else
m_state = CACHE_EXPECTING_NOTHING; {
gwbuf_free(pPacket); MXS_ERROR("Could not create cache key.");
DCB *dcb = m_pSession->client_dcb; m_state = CACHE_IGNORING_RESPONSE;
// TODO: This is not ok. Any filters before this filter, will not
// TODO: see this data.
rv = dcb->func.write(dcb, pResponse);
}
} }
} }
else else
@ -775,31 +797,6 @@ void CacheFilterSession::reset_response_state()
m_res.offset = 0; m_res.offset = 0;
} }
/**
* Route a query via the cache.
*
* @param key A SELECT packet.
* @param value The result.
* @return True if the query was satisfied from the query.
*/
cache_result_t CacheFilterSession::get_cached_response(const GWBUF *pQuery, GWBUF **ppResponse)
{
cache_result_t result = m_pCache->get_key(m_zDefaultDb, pQuery, &m_key);
if (CACHE_RESULT_IS_OK(result))
{
uint32_t flags = CACHE_FLAGS_INCLUDE_STALE;
result = m_pCache->get_value(m_key, flags, ppResponse);
}
else
{
MXS_ERROR("Could not create cache key.");
}
return result;
}
/** /**
* Store the data. * Store the data.
* *

2
server/modules/filter/cache/cachefiltersession.hh vendored
View File

@ -102,8 +102,6 @@ private:
void reset_response_state(); void reset_response_state();
cache_result_t get_cached_response(const GWBUF *pQuery, GWBUF **ppResponse);
bool log_decisions() const bool log_decisions() const
{ {
return m_pCache->config().debug & CACHE_DEBUG_DECISIONS ? true : false; return m_pCache->config().debug & CACHE_DEBUG_DECISIONS ? true : false;