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

MXS-2220 Move server response calculation functions inside class

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-08 10:17:07 +02:00
parent df17619722
commit 9cac927542
5 changed files with 45 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/readwritesplit/rwsplit_select_backends.cc
View File

@ -129,7 +129,7 @@ PRWBackends::iterator backend_cmp_response_time(PRWBackends& sBackends)
for (int i = 0; i < SZ; ++i)
{
SERVER_REF* server = (*sBackends[i]).backend();
double ave = server_response_time_average(server->server);
double ave = server->server->response_time_average();
if (ave == 0)
{
@ -302,7 +302,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
case ADAPTIVE_ROUTING:
{
maxbase::Duration response_ave(server_response_time_average(b->server));
maxbase::Duration response_ave(b->server->response_time_average());
std::ostringstream os;
os << response_ave;
MXS_INFO("adaptive avg. select time: %s from \t[%s]:%d %s",

10
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -120,9 +120,7 @@ void RWSplitSession::close()
if (stat.make_valid())
{
server_add_response_average(backend->server(),
stat.average().secs(),
stat.num_samples());
backend->server()->response_time_add(stat.average().secs(), stat.num_samples());
}
backend->response_stat().reset();
@ -637,11 +635,9 @@ void RWSplitSession::clientReply(GWBUF* writebuf, DCB* backend_dcb)
ResponseStat& stat = backend->response_stat();
stat.query_ended();
if (stat.is_valid() && (stat.sync_time_reached()
|| server_response_time_num_samples(backend->server()) == 0))
|| backend->server()->response_time_num_samples() == 0))
{
server_add_response_average(backend->server(),
stat.average().secs(),
stat.num_samples());
backend->server()->response_time_add(stat.average().secs(), stat.num_samples());
stat.reset();
}