From 90e3247bf3fc54e126e643162fbc23619fd00767 Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Thu, 21 Sep 2023 13:41:53 +0200 Subject: [PATCH 01/28] Added duplicate server check to prevent redundant server inspections, that can cause unique constraint error on mysql_server_galera_log table. --- lib/MySQL_Monitor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index 8afc846150..371f7d2098 100644 --- a/lib/MySQL_Monitor.cpp +++ b/lib/MySQL_Monitor.cpp @@ -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; + + auto ret = checked_servers.insert(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 From 52f206d36cb0d57eee158b207bface971d53a67a Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Mon, 25 Sep 2023 14:50:12 +0200 Subject: [PATCH 02/28] Added writer_hostgroup in duplicate check.\n Added INSERT OR IGNORE on mysql_server_galera_log table. --- lib/MySQL_Monitor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index 371f7d2098..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); @@ -8022,8 +8022,8 @@ 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; - - auto ret = checked_servers.insert(std::string(r->fields[1]) + ":" + std::string(r->fields[2])); + // 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; From 5c52a596e6a9c3a1edcb7ec7742812fbd9e87971 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:38:40 +0200 Subject: [PATCH 03/28] Update CI-builds.yml --- .github/workflows/CI-builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-builds.yml b/.github/workflows/CI-builds.yml index 27dcb0b700..d907710847 100644 --- a/.github/workflows/CI-builds.yml +++ b/.github/workflows/CI-builds.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 63552857d1d1e7aa3038a89d2f5d45ee5eadfffe Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:39:22 +0200 Subject: [PATCH 04/28] Update CI-3p-mysql-connector-j.yml --- .github/workflows/CI-3p-mysql-connector-j.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml index f396c15df5..9101d0194e 100644 --- a/.github/workflows/CI-3p-mysql-connector-j.yml +++ b/.github/workflows/CI-3p-mysql-connector-j.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 99263a946b89e79195bdca0b3cedb21ceaa5910a Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:39:39 +0200 Subject: [PATCH 05/28] Update CI-basictests.yml --- .github/workflows/CI-basictests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-basictests.yml b/.github/workflows/CI-basictests.yml index 459b3a7525..a508dafef8 100644 --- a/.github/workflows/CI-basictests.yml +++ b/.github/workflows/CI-basictests.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: cache: From c01ce82e7edb5347abad90bc260a48860506d018 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:41:13 +0200 Subject: [PATCH 06/28] Update CI-cb_taptests.yml --- .github/workflows/CI-cb_taptests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-cb_taptests.yml b/.github/workflows/CI-cb_taptests.yml index c31812489a..5a6566c629 100644 --- a/.github/workflows/CI-cb_taptests.yml +++ b/.github/workflows/CI-cb_taptests.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 815d4dc78d41d0994a95bc3c617029be240a8b38 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:42:37 +0200 Subject: [PATCH 07/28] Update CI-codeql.yml --- .github/workflows/CI-codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-codeql.yml b/.github/workflows/CI-codeql.yml index 43a2a68451..368ef5409c 100644 --- a/.github/workflows/CI-codeql.yml +++ b/.github/workflows/CI-codeql.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 9d4d97cef22498f67cdf8b4edbc42cad86c8dd6a Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:42:52 +0200 Subject: [PATCH 08/28] Update CI-maketest.yml --- .github/workflows/CI-maketest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-maketest.yml b/.github/workflows/CI-maketest.yml index ea582bd5b6..c31168d15b 100644 --- a/.github/workflows/CI-maketest.yml +++ b/.github/workflows/CI-maketest.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From d9cf38a37759be779e3dc79835af57d552de5b0a Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:43:10 +0200 Subject: [PATCH 09/28] Update CI-package-build.yml --- .github/workflows/CI-package-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-package-build.yml b/.github/workflows/CI-package-build.yml index 8ed38ee32e..4ad70c2493 100644 --- a/.github/workflows/CI-package-build.yml +++ b/.github/workflows/CI-package-build.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 51f56a57923a08ba1ebd698f2795311a6d9effc9 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:43:42 +0200 Subject: [PATCH 10/28] Update CI-repltests.yml --- .github/workflows/CI-repltests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-repltests.yml b/.github/workflows/CI-repltests.yml index bdd962edc0..401133f336 100644 --- a/.github/workflows/CI-repltests.yml +++ b/.github/workflows/CI-repltests.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From 0893884dcae2b9de3e69231176a12e3a2079525e Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:43:54 +0200 Subject: [PATCH 11/28] Update CI-selftests.yml --- .github/workflows/CI-selftests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-selftests.yml b/.github/workflows/CI-selftests.yml index 9461dfc966..5c96b11a86 100644 --- a/.github/workflows/CI-selftests.yml +++ b/.github/workflows/CI-selftests.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: cache: From b0e7a2b9e575b13c4cf8c1a1cba1a4b681d75fe3 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:44:07 +0200 Subject: [PATCH 12/28] Update CI-shuntest.yml --- .github/workflows/CI-shuntest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-shuntest.yml b/.github/workflows/CI-shuntest.yml index 759512c9bb..6a8e11e0b4 100644 --- a/.github/workflows/CI-shuntest.yml +++ b/.github/workflows/CI-shuntest.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: run: From dffa69dcdd6c1bed5788dda4f4fd91d2f3de23a7 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:44:41 +0200 Subject: [PATCH 13/28] Update CI-taptests-groups.yml --- .github/workflows/CI-taptests-groups.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-taptests-groups.yml b/.github/workflows/CI-taptests-groups.yml index 06123a2d4f..81a6fc04d0 100644 --- a/.github/workflows/CI-taptests-groups.yml +++ b/.github/workflows/CI-taptests-groups.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: cache: From 317b2bc379efdbae26b4aa2b81d765d0c662a4c3 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:44:52 +0200 Subject: [PATCH 14/28] Update CI-taptests-ssl.yml --- .github/workflows/CI-taptests-ssl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-taptests-ssl.yml b/.github/workflows/CI-taptests-ssl.yml index 906cbe5881..e86f07ace3 100644 --- a/.github/workflows/CI-taptests-ssl.yml +++ b/.github/workflows/CI-taptests-ssl.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: cache: From 277b59a252b821f586c3ec385183d753d5b370e8 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 2 Oct 2023 15:45:08 +0200 Subject: [PATCH 15/28] Update CI-taptests.yml --- .github/workflows/CI-taptests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-taptests.yml b/.github/workflows/CI-taptests.yml index 9bb0eb4287..414cfc58ee 100644 --- a/.github/workflows/CI-taptests.yml +++ b/.github/workflows/CI-taptests.yml @@ -17,7 +17,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} - cancel-in-progress: false +# cancel-in-progress: false jobs: cache: From 79eacefd05b1f1838351f8d788f2962673ec98ea Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:10:25 +0200 Subject: [PATCH 16/28] Update CI-builds.yml --- .github/workflows/CI-builds.yml | 1 - 1 file changed, 1 deletion(-) 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: From ae38ae3f35798aa06206dbc0a66a4a7206877b4b Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:10:41 +0200 Subject: [PATCH 17/28] Update CI-taptests-ssl.yml --- .github/workflows/CI-taptests-ssl.yml | 1 - 1 file changed, 1 deletion(-) 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: From 1d69def10faf844fb891ff4caf12d4a23cb753cb Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:10:53 +0200 Subject: [PATCH 18/28] Update CI-taptests-groups.yml --- .github/workflows/CI-taptests-groups.yml | 1 - 1 file changed, 1 deletion(-) 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: From c69795c27272c8c8f4467e5b9bfb802a1a2ad447 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:11:06 +0200 Subject: [PATCH 19/28] Update CI-taptests.yml --- .github/workflows/CI-taptests.yml | 1 - 1 file changed, 1 deletion(-) 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: From ca75017312a4b5fe960eea0b7c3a09995f83f230 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:11:31 +0200 Subject: [PATCH 20/28] Update CI-selftests.yml --- .github/workflows/CI-selftests.yml | 1 - 1 file changed, 1 deletion(-) 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: From c4375eacd60bc8ec34c2c6cffb3b631247c8d31c Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:11:49 +0200 Subject: [PATCH 21/28] Update CI-package-build.yml --- .github/workflows/CI-package-build.yml | 1 - 1 file changed, 1 deletion(-) 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: From 4fdf9d3f2dc92ad6ea16822353e521d2b98b3fcc Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:12:12 +0200 Subject: [PATCH 22/28] Update CI-basictests.yml --- .github/workflows/CI-basictests.yml | 1 - 1 file changed, 1 deletion(-) 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: From 7ce5f9cb369cb5d45afd814b69edd2773597bb14 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:12:25 +0200 Subject: [PATCH 23/28] Update CI-3p-mysql-connector-j.yml --- .github/workflows/CI-3p-mysql-connector-j.yml | 1 - 1 file changed, 1 deletion(-) 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: From 32ce90c17a4f2c4f6f5a4254d0eb3dbc98a2ddf0 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:12:49 +0200 Subject: [PATCH 24/28] Update CI-cb_taptests.yml --- .github/workflows/CI-cb_taptests.yml | 1 - 1 file changed, 1 deletion(-) 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: From 0a58b3e218d58097fe7fa1b586c4999c02a7ec8b Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:13:08 +0200 Subject: [PATCH 25/28] Update CI-codeql.yml --- .github/workflows/CI-codeql.yml | 1 - 1 file changed, 1 deletion(-) 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: From 1f621ad64117f8e471f9845d7c65abe46dc9c36b Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:13:21 +0200 Subject: [PATCH 26/28] Update CI-maketest.yml --- .github/workflows/CI-maketest.yml | 1 - 1 file changed, 1 deletion(-) 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: From f1e995aa1b01a2a66183af2fe8b0d8ed7d41bdb2 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:13:34 +0200 Subject: [PATCH 27/28] Update CI-repltests.yml --- .github/workflows/CI-repltests.yml | 1 - 1 file changed, 1 deletion(-) 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: From a89dc6f9f22952d7612e4e9cbd950805d5ae32e8 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 17 Oct 2023 20:13:55 +0200 Subject: [PATCH 28/28] Update CI-shuntest.yml --- .github/workflows/CI-shuntest.yml | 1 - 1 file changed, 1 deletion(-) 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: