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

MXS-2972: Store servers in the cache key

Browse Source 
This allows the set of servers used by the service to also participate in
the cache value resolution. This will prevent the most obvious of problems
but any abstractions of the servers will prevent this from working.
This commit is contained in:
Markus Mäkelä 2020-04-22 09:06:58 +03:00
parent e87ad4abb9
commit 25b8eeb415
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -45,7 +45,7 @@ SchemaRouterSession::SchemaRouterSession(MXS_SESSION* session,
, m_backends(backends)
, m_config(router->m_config)
, m_router(router)
, m_shard(m_router->m_shard_manager.get_shard(m_client->user, m_config->refresh_min_interval))
, m_shard(m_router->m_shard_manager.get_shard(get_cache_key(), m_config->refresh_min_interval))
, m_state(0)
, m_sent_sescmd(0)
, m_replied_sescmd(0)
@ -665,7 +665,7 @@ void SchemaRouterSession::handleError(GWBUF* pMessage,
void SchemaRouterSession::synchronize_shards()
{
m_router->m_stats.shmap_cache_miss++;
m_router->m_shard_manager.update_shard(m_shard, m_client->user);
m_router->m_shard_manager.update_shard(m_shard, get_cache_key());
}
/**
@ -1784,4 +1784,19 @@ SERVER* SchemaRouterSession::get_ps_target(GWBUF* buffer, uint32_t qtype, qc_que
}
return rval;
}
std::string SchemaRouterSession::get_cache_key() const
{
std::string key = m_client->user;
for (const auto& b : m_backends)
{
if (b->in_use())
{
key += b->name();
}
}
return key;
}
}

1
server/modules/routing/schemarouter/schemaroutersession.hh
View File

@ -151,6 +151,7 @@ private:
void synchronize_shards();
void handle_mapping_reply(SSRBackend& bref, GWBUF** pPacket);
bool handle_statement(GWBUF* querybuf, SSRBackend& bref, uint8_t command, uint32_t type);
std::string get_cache_key() const;
/** Member variables */
bool m_closed; /**< True if session closed */