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

MXS-1777 Change LOWEST_RESPONSE_TIME to ADAPTIVE_ROUTING

Browse Source 
LOWEST_RESPONSE_TIME is not quite correct, and marketing material
will call it Adaptive Routing, so better match that.
This commit is contained in:
Niclas Antti 2018-10-04 19:26:16 +03:00
parent ef948042f0
commit 3b1b63d939
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/readwritesplit/readwritesplit.hh
View File

@ -65,7 +65,7 @@ enum select_criteria_t
LEAST_ROUTER_CONNECTIONS, /**< connections established by this router */
LEAST_BEHIND_MASTER,
LEAST_CURRENT_OPERATIONS,
LOWEST_RESPONSE_TIME
ADAPTIVE_ROUTING
};
/**
@ -94,7 +94,7 @@ static const MXS_ENUM_VALUE slave_selection_criteria_values[] =
{"LEAST_ROUTER_CONNECTIONS", LEAST_ROUTER_CONNECTIONS},
{"LEAST_BEHIND_MASTER", LEAST_BEHIND_MASTER },
{"LEAST_CURRENT_OPERATIONS", LEAST_CURRENT_OPERATIONS},
{"LOWEST_RESPONSE_TIME", LOWEST_RESPONSE_TIME },
{"ADAPTIVE_ROUTING", ADAPTIVE_ROUTING },
{NULL}
};
@ -353,8 +353,8 @@ static inline const char* select_criteria_to_str(select_criteria_t type)
case LEAST_CURRENT_OPERATIONS:
return "LEAST_CURRENT_OPERATIONS";
case LOWEST_RESPONSE_TIME:
return "LOWEST_RESPONSE_TIME";
case ADAPTIVE_ROUTING:
return "ADAPTIVE_ROUTING";
default:
return "UNDEFINED_CRITERIA";

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

@ -190,7 +190,7 @@ BackendSelectFunction get_backend_select_function(select_criteria_t sc)
case LEAST_CURRENT_OPERATIONS:
return backend_cmp_current_load;
case LOWEST_RESPONSE_TIME:
case ADAPTIVE_ROUTING:
return backend_cmp_response_time;
}
@ -297,7 +297,7 @@ static void log_server_connections(select_criteria_t criteria, const SRWBackendL
STRSRVSTATUS(b->server));
break;
case LOWEST_RESPONSE_TIME:
case ADAPTIVE_ROUTING:
{
maxbase::Duration response_ave(server_response_time_average(b->server));
std::ostringstream os;