Skip to content

Commit

Permalink
Merge branch 'v2.x-tap_tests_opt_ssl' of https://github.com/sysown/pr…
Browse files Browse the repository at this point in the history
…oxysql into v2.x-tap_tests_opt_ssl
  • Loading branch information
mirostauder committed Oct 23, 2023
2 parents 50305ea + b45e50a commit 36b386b
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI-3p-mysql-connector-j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-basictests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
cache:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-cb_taptests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-maketest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-repltests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-selftests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
cache:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-shuntest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
run:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-taptests-groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
cache:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-taptests-ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
cache:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CI-taptests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
# cancel-in-progress: false

jobs:
cache:
Expand Down
9 changes: 7 additions & 2 deletions lib/MySQL_Monitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5265,7 +5265,7 @@ void MySQL_Monitor::populate_monitor_mysql_server_galera_log() {
int rc;
//char *query=NULL;
char *query1=NULL;
query1=(char *)"INSERT INTO mysql_server_galera_log VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)";
query1=(char *)"INSERT OR IGNORE INTO mysql_server_galera_log VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)";
sqlite3_stmt *statement1=NULL;
pthread_mutex_lock(&GloMyMon->galera_mutex);
//rc=(*proxy_sqlite3_prepare_v2)(mondb, query1, -1, &statement1, 0);
Expand Down Expand Up @@ -8014,14 +8014,19 @@ bool MySQL_Monitor::monitor_galera_process_ready_tasks(const std::vector<MySQL_M
void MySQL_Monitor::monitor_galera_async() {

std::vector<std::unique_ptr<MySQL_Monitor_State_Data>> mmsds;

std::set<std::string> checked_servers;
pthread_mutex_lock(&galera_mutex);
assert(Galera_Hosts_resultset);
mmsds.reserve(Galera_Hosts_resultset->rows_count);
Monitor_Poll monitor_poll(Galera_Hosts_resultset->rows_count);

for (std::vector<SQLite3_row*>::iterator it = Galera_Hosts_resultset->rows.begin(); it != Galera_Hosts_resultset->rows.end(); ++it) {
const SQLite3_row* r = *it;
// r->fields[0] = writer_hostgroup, r->fields[1] = hostname, r->fields[2] = port
auto ret = checked_servers.insert(std::string(r->fields[0]) + ":" + std::string(r->fields[1]) + ":" + std::string(r->fields[2]));
if (ret.second == false) // duplicate server entry
continue;

bool rc_ping = server_responds_to_ping(r->fields[1], atoi(r->fields[2]));
if (rc_ping) { // only if server is responding to pings

Expand Down

0 comments on commit 36b386b

Please sign in to comment.