aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3735 from sysown/v2.x-3734

Browse Source 
Closes #3734: `last_updated` field from `stats_mysql_client_host_cache` should be reported in seconds
pull/3747/head
René Cannaò 4 years ago committed by GitHub
parent e39446f27e 77a114ebc8
commit 6000ededda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File

6
lib/MySQL_Thread.cpp
Unescape View File

@ -2492,10 +2492,14 @@ char** client_host_cache_entry_row(
char** row =
static_cast<char**>(malloc(sizeof(char*)*CLIENT_HOST_CACHE_COLUMNS));
time_t __now = time(NULL);
unsigned long long curtime = monotonic_time();
time_t last_updated = __now - curtime/1000000 + entry.updated_at/1000000;
row[0]=strdup(address.c_str());
sprintf(buff, "%u", entry.error_count);
row[1]=strdup(buff);
sprintf(buff, "%lu", entry.updated_at);
sprintf(buff, "%lu", last_updated);
row[2]=strdup(buff);
return row;

4
lib/ProxySQL_Admin.cpp
Unescape View File

@ -492,8 +492,8 @@ static int http_handler(void *cls, struct MHD_Connection *connection, const char
#define STATS_SQLITE_TABLE_MYSQL_ERRORS "CREATE TABLE stats_mysql_errors (hostgroup INT NOT NULL , hostname VARCHAR NOT NULL , port INT NOT NULL , username VARCHAR NOT NULL , client_address VARCHAR NOT NULL , schemaname VARCHAR NOT NULL , errno INT NOT NULL , count_star INTEGER NOT NULL , first_seen INTEGER NOT NULL , last_seen INTEGER NOT NULL , last_error VARCHAR NOT NULL DEFAULT '' , PRIMARY KEY (hostgroup, hostname, port, username, schemaname, errno) )"
#define STATS_SQLITE_TABLE_MYSQL_ERRORS_RESET "CREATE TABLE stats_mysql_errors_reset (hostgroup INT NOT NULL , hostname VARCHAR NOT NULL , port INT NOT NULL , username VARCHAR NOT NULL , client_address VARCHAR NOT NULL , schemaname VARCHAR NOT NULL , errno INT NOT NULL , count_star INTEGER NOT NULL , first_seen INTEGER NOT NULL , last_seen INTEGER NOT NULL , last_error VARCHAR NOT NULL DEFAULT '' , PRIMARY KEY (hostgroup, hostname, port, username, schemaname, errno) )"
#define STATS_SQLITE_TABLE_MYSQL_CLIENT_HOST_CACHE "CREATE TABLE stats_mysql_client_host_cache (client_address VARCHAR NOT NULL, error_count INT NOT NULL, last_updated BIGINT NOT NULL)"
#define STATS_SQLITE_TABLE_MYSQL_CLIENT_HOST_CACHE_RESET "CREATE TABLE stats_mysql_client_host_cache_reset (client_address VARCHAR NOT NULL, error_count INT NOT NULL, last_updated BIGINT NOT NULL)"
#define STATS_SQLITE_TABLE_MYSQL_CLIENT_HOST_CACHE "CREATE TABLE stats_mysql_client_host_cache (client_address VARCHAR NOT NULL , error_count INT NOT NULL , last_updated BIGINT NOT NULL)"
#define STATS_SQLITE_TABLE_MYSQL_CLIENT_HOST_CACHE_RESET "CREATE TABLE stats_mysql_client_host_cache_reset (client_address VARCHAR NOT NULL , error_count INT NOT NULL , last_updated BIGINT NOT NULL)"
#ifdef DEBUG
#define ADMIN_SQLITE_TABLE_DEBUG_LEVELS "CREATE TABLE debug_levels (module VARCHAR NOT NULL PRIMARY KEY , verbosity INT NOT NULL DEFAULT 0)"

68
test/tap/tests/test_client_limit_error-t.cpp
Unescape View File

@ -60,10 +60,9 @@ const uint32_t NUM_LOOPBACK_ADDRS = 5;
using host_cache_entry = std::tuple<std::string, uint32_t, uint64_t>;
inline unsigned long long monotonic_time() {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return (((unsigned long long) ts.tv_sec) * 1000000) + (ts.tv_nsec / 1000);
inline unsigned long long realtime_time_s() {
time_t __now = time(NULL);
return __now;
}
std::vector<host_cache_entry> get_client_host_cache_entries(MYSQL* proxysql_admin) {
@ -151,7 +150,7 @@ int test_cache_filled_by_invalid_conn(const CommandLine& cl, MYSQL* proxysql_adm
// There shouldn't be any other entries in the cache for this test.
MYSQL_QUERY(proxysql_admin, "PROXYSQL FLUSH MYSQL CLIENT HOSTS");
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
const std::string exp_client_addr { "127.0.0.2" };
diag("Performing connection to fill 'client_host_cache'");
@ -175,12 +174,13 @@ int test_cache_filled_by_invalid_conn(const CommandLine& cl, MYSQL* proxysql_adm
const std::string client_addr { std::get<0>(unique_entry) };
const uint32_t error_count { std::get<1>(unique_entry) };
const uint64_t last_updated { std::get<2>(unique_entry) };
uint64_t post_command_time = monotonic_time();
uint64_t post_command_time = realtime_time_s();
ok(
client_addr == exp_client_addr && error_count == 1 && (pre_command_time < last_updated < post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld)",
client_addr == exp_client_addr && error_count == 1 &&
(pre_command_time <= (last_updated + 1) && (last_updated - 1) <= post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld)",
exp_client_addr.c_str(), 1, pre_command_time, last_updated, post_command_time, client_addr.c_str(), error_count,
pre_command_time, last_updated, post_command_time
);
@ -206,7 +206,7 @@ int test_cache_entry_count_by_invalid_conn(const CommandLine& cl, MYSQL* proxysq
MYSQL_QUERY(proxysql_admin, "PROXYSQL FLUSH MYSQL CLIENT HOSTS");
int errors = 0;
const std::string exp_client_addr { "127.0.0.2" };
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
diag("Performing connection to fill 'client_host_cache'");
for (errors = 0; errors < 5; errors++) {
@ -232,13 +232,13 @@ int test_cache_entry_count_by_invalid_conn(const CommandLine& cl, MYSQL* proxysq
const std::string client_addr { std::get<0>(unique_entry) };
const uint32_t error_count { std::get<1>(unique_entry) };
const uint64_t last_updated { std::get<2>(unique_entry) };
uint64_t post_command_time = monotonic_time();
uint64_t post_command_time = realtime_time_s();
ok(
client_addr == exp_client_addr && error_count == errors &&
(pre_command_time < last_updated < post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld)",
(pre_command_time <= (last_updated + 1) && (last_updated - 1) <= post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld)",
exp_client_addr.c_str(), 1, pre_command_time, last_updated, post_command_time,
client_addr.c_str(), error_count, pre_command_time, last_updated, post_command_time
);
@ -268,7 +268,7 @@ int test_cache_entry_count_by_mult_invalid_conns(const CommandLine& cl, MYSQL* p
MYSQL_QUERY(proxysql_admin, "PROXYSQL FLUSH MYSQL CLIENT HOSTS");
int errors = 0;
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
printf("\n");
diag("Performing connections to fill 'client_host_cache'");
@ -299,15 +299,15 @@ int test_cache_entry_count_by_mult_invalid_conns(const CommandLine& cl, MYSQL* p
const std::string client_addr { std::get<0>(entry) };
const uint32_t error_count { std::get<1>(entry) };
const uint64_t last_updated { std::get<2>(entry) };
uint64_t post_command_time = monotonic_time();
uint64_t post_command_time = realtime_time_s();
std::string exp_client_addr { "127.0.0." + std::to_string(entry_num) };
ok(
client_addr == exp_client_addr && error_count == errors &&
(pre_command_time < last_updated < post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld)",
(pre_command_time <= (last_updated + 1) && (last_updated - 1) <= post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld)",
exp_client_addr.c_str(), errors, pre_command_time, last_updated, post_command_time,
client_addr.c_str(), error_count, pre_command_time, last_updated, post_command_time
);
@ -348,7 +348,7 @@ int test_client_exceeding_cache_error_limit(const CommandLine& cl, MYSQL* proxys
loopback_addrs.push_back("127.0.0." + std::to_string(i));
}
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
printf("\n");
diag("Performing connections to fill 'client_host_cache'");
@ -379,15 +379,15 @@ int test_client_exceeding_cache_error_limit(const CommandLine& cl, MYSQL* proxys
const std::string client_addr { std::get<0>(entry) };
const uint32_t error_count { std::get<1>(entry) };
const uint64_t last_updated { std::get<2>(entry) };
uint64_t post_command_time = monotonic_time();
uint64_t post_command_time = realtime_time_s();
std::string exp_client_addr { "127.0.0." + std::to_string(entry_num) };
ok(
client_addr == exp_client_addr && error_count == errors &&
(pre_command_time < last_updated < post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld)",
(pre_command_time <= (last_updated + 1) && (last_updated - 1) <= post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld)",
exp_client_addr.c_str(), errors, pre_command_time, last_updated, post_command_time,
client_addr.c_str(), error_count, pre_command_time, last_updated, post_command_time
);
@ -519,7 +519,7 @@ int test_client_exceeding_changed_error_limit(const CommandLine& cl, MYSQL* prox
int errors = 0;
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
std::string loopback_addr { "127.0.0.2" };
diag("Performing connections to fill 'client_host_cache'");
@ -581,7 +581,7 @@ int test_cache_size_decrease_by_new_connections(const CommandLine& cl, MYSQL* pr
loopback_addrs.push_back("127.0.0." + std::to_string(i));
}
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
printf("\n");
diag("Performing connections to fill 'client_host_cache'");
@ -598,7 +598,7 @@ int test_cache_size_decrease_by_new_connections(const CommandLine& cl, MYSQL* pr
// Update the latest entry in the cache, oldest member "10.200.1.2" should go away.
{
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
diag("1. Checking that the connection updates the entry and the oldest entry is removed");
@ -631,9 +631,9 @@ int test_cache_size_decrease_by_new_connections(const CommandLine& cl, MYSQL* pr
}
ok(
exp_client_addr == act_client_addr && last_updated > pre_command_time,
exp_client_addr == act_client_addr && (last_updated + 1) >= pre_command_time,
"Entry should be present and updated with the following values -"
" exp('%s', %ld > %ld), act('%s', %ld > %ld)", exp_client_addr.c_str(),
" exp('%s', %ld >= %ld), act('%s', %ld >= %ld)", exp_client_addr.c_str(),
last_updated, pre_command_time, act_client_addr.c_str(), last_updated,
pre_command_time
);
@ -799,7 +799,7 @@ int test_cache_populated_timeout_conns(const CommandLine& cl, MYSQL* proxysql_ad
MYSQL_QUERY(proxysql_admin, "LOAD MYSQL VARIABLES TO RUNTIME");
MYSQL_QUERY(proxysql_admin, "PROXYSQL FLUSH MYSQL CLIENT HOSTS");
uint64_t pre_command_time = monotonic_time();
uint64_t pre_command_time = realtime_time_s();
for (int i = 2; i < NUM_LOOPBACK_ADDRS; i++) {
std::string loopback_addr { "127.0.0." + std::to_string(i) };
@ -818,15 +818,15 @@ int test_cache_populated_timeout_conns(const CommandLine& cl, MYSQL* proxysql_ad
const std::string client_addr { std::get<0>(entry) };
const uint32_t error_count { std::get<1>(entry) };
const uint64_t last_updated { std::get<2>(entry) };
uint64_t post_command_time = monotonic_time();
uint64_t post_command_time = realtime_time_s();
std::string exp_client_addr { "127.0.0." + std::to_string(entry_num + 2) };
ok(
client_addr == exp_client_addr && error_count == errors &&
(pre_command_time < last_updated < post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld < %ld < %ld)",
(pre_command_time <= (last_updated + 1) && (last_updated - 1) <= post_command_time),
"Entry should match expected values - exp(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld),"
" act(addr: %s, err_count: %d, last_updated: %ld <= %ld +/- 1 <= %ld)",
exp_client_addr.c_str(), errors, pre_command_time, last_updated, post_command_time,
client_addr.c_str(), error_count, pre_command_time, last_updated, post_command_time
);

Write Preview
Loading…
Cancel
Save