Merge branch 'v2.x' into v2.x-tap_tests_opt_ssl

sysown · Oct 20, 2023 · b45e50a · b45e50a
2 parents f06c109 + a89dc6f
commit b45e50a
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,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