diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml index 9101d0194e..2389589849 100644 --- a/.github/workflows/CI-3p-mysql-connector-j.yml +++ b/.github/workflows/CI-3p-mysql-connector-j.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-basictests.yml b/.github/workflows/CI-basictests.yml index a508dafef8..c67c20e55e 100644 --- a/.github/workflows/CI-basictests.yml +++ b/.github/workflows/CI-basictests.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: cache: diff --git a/.github/workflows/CI-builds.yml b/.github/workflows/CI-builds.yml index d907710847..0afd290b79 100644 --- a/.github/workflows/CI-builds.yml +++ b/.github/workflows/CI-builds.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-cb_taptests.yml b/.github/workflows/CI-cb_taptests.yml index 5a6566c629..986d5d8e4d 100644 --- a/.github/workflows/CI-cb_taptests.yml +++ b/.github/workflows/CI-cb_taptests.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-codeql.yml b/.github/workflows/CI-codeql.yml index 368ef5409c..1d71497b44 100644 --- a/.github/workflows/CI-codeql.yml +++ b/.github/workflows/CI-codeql.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-maketest.yml b/.github/workflows/CI-maketest.yml index c31168d15b..8c2b25a97b 100644 --- a/.github/workflows/CI-maketest.yml +++ b/.github/workflows/CI-maketest.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-package-build.yml b/.github/workflows/CI-package-build.yml index 4ad70c2493..5ee9b902d8 100644 --- a/.github/workflows/CI-package-build.yml +++ b/.github/workflows/CI-package-build.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-repltests.yml b/.github/workflows/CI-repltests.yml index 401133f336..ea067e70fc 100644 --- a/.github/workflows/CI-repltests.yml +++ b/.github/workflows/CI-repltests.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-selftests.yml b/.github/workflows/CI-selftests.yml index 5c96b11a86..13461ed60f 100644 --- a/.github/workflows/CI-selftests.yml +++ b/.github/workflows/CI-selftests.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: cache: diff --git a/.github/workflows/CI-shuntest.yml b/.github/workflows/CI-shuntest.yml index 6a8e11e0b4..406ac6af30 100644 --- a/.github/workflows/CI-shuntest.yml +++ b/.github/workflows/CI-shuntest.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: run: diff --git a/.github/workflows/CI-taptests-groups.yml b/.github/workflows/CI-taptests-groups.yml index 81a6fc04d0..b44dd79a66 100644 --- a/.github/workflows/CI-taptests-groups.yml +++ b/.github/workflows/CI-taptests-groups.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: cache: diff --git a/.github/workflows/CI-taptests-ssl.yml b/.github/workflows/CI-taptests-ssl.yml index e86f07ace3..94812e613f 100644 --- a/.github/workflows/CI-taptests-ssl.yml +++ b/.github/workflows/CI-taptests-ssl.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: cache: diff --git a/.github/workflows/CI-taptests.yml b/.github/workflows/CI-taptests.yml index 414cfc58ee..490f0d7298 100644 --- a/.github/workflows/CI-taptests.yml +++ b/.github/workflows/CI-taptests.yml @@ -17,7 +17,6 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} -# cancel-in-progress: false jobs: cache: diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index 8afc846150..f0db67eafa 100644 --- a/lib/MySQL_Monitor.cpp +++ b/lib/MySQL_Monitor.cpp @@ -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); @@ -8014,7 +8014,7 @@ bool MySQL_Monitor::monitor_galera_process_ready_tasks(const std::vector> mmsds; - + std::set checked_servers; pthread_mutex_lock(&galera_mutex); assert(Galera_Hosts_resultset); mmsds.reserve(Galera_Hosts_resultset->rows_count); @@ -8022,6 +8022,11 @@ void MySQL_Monitor::monitor_galera_async() { for (std::vector::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