Added writer_hostgroup in duplicate check.\n Added INSERT OR IGNORE o…

…n mysql_server_galera_log table.
sysown · Sep 25, 2023 · 52f206d · 52f206d
1 parent 90e3247
commit 52f206d
Showing 1 changed file with 3 additions and 3 deletions.
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);
@@ -8022,8 +8022,8 @@ void MySQL_Monitor::monitor_galera_async() {
 
 	for (std::vector<SQLite3_row*>::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;