admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-09 14:03:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

B OpenNebula/one#6543: Remove MYSQL_OPT_RECONNECT (#3032)

Browse Source 
* Improve OpenNebula reconnect procedure

(cherry picked from commit 63ce359f94)
This commit is contained in:
Pavel Czerný authored and Ruben S. Montero committed 2024-04-15 11:59:42 +02:00
1 parent f75ab3784e
commit a16dfd5f8f
1 file changed
+19 -13
Download Patch File Download Diff File Expand all files Collapse all files
src/sql/MySqlDB.cc
+19 -13
View File
@@ -203,9 +203,6 @@ MySqlDB::MySqlDB(const string& s, int p, const string& u, const string& _p,
{
connections[i] = mysql_init(NULL);
bool reconnect = true;
mysql_options(connections[i], MYSQL_OPT_RECONNECT, &reconnect);
mysql_options(connections[i], MYSQL_SET_CHARSET_NAME, encoding.c_str());
rc = mysql_real_connect(connections[i], server.c_str(), user.c_str(),
@@ -355,13 +352,19 @@ int MySqlDB::exec_ext(std::ostringstream& cmd, Callbackable *obj, bool quiet)
password.c_str(), database.c_str(), port, NULL, 0))
{
oss << "... Reconnected.";
// Retry the sql command
if (mysql_query(db, c_str) != 0)
{
ec = SqlDB::CONNECTION;
}
}
else
{
oss << "... Reconnection attempt failed.";
ec = SqlDB::CONNECTION;
}
ec = SqlDB::CONNECTION;
break;
// Error codes that should be considered applied for the RAFT log.
@@ -374,17 +377,20 @@ int MySqlDB::exec_ext(std::ostringstream& cmd, Callbackable *obj, bool quiet)
break;
}
if (ec != SqlError::CONNECTION)
if (ec != SqlDB::SUCCESS) // Reconnected, second run of the query succesfull
{
oss << "SQL command was: " << c_str;
oss << ", error " << err_num << " : " << err_msg;
if (ec != SqlError::CONNECTION)
{
oss << "SQL command was: " << c_str;
oss << ", error " << err_num << " : " << err_msg;
}
NebulaLog::log("ONE", error_level, oss);
free_db_connection(db);
return ec;
}
NebulaLog::log("ONE", error_level, oss);
free_db_connection(db);
return ec;
}
if (obj != 0)