Improved error reporting on MySQL query failures

lsst · Jul 20, 2023 · 32add4c · 32add4c
1 parent af49ac2
commit 32add4c
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/rproc/InfileMerger.cc b/src/rproc/InfileMerger.cc
@@ -102,6 +102,11 @@ std::string getTimeStampId() {
 
 const char JOB_ID_BASE_NAME[] = "jobId";
 size_t const MB_SIZE_BYTES = 1024 * 1024;
+
+/// @return Error info on the last operation with MySQL
+string lastMysqlError(MYSQL* mysql) {
+    return "error: " + string(mysql_error(mysql)) + ", errno: " + to_string(mysql_errno(mysql));
+}
 }  // anonymous namespace
 
 namespace lsst::qserv::rproc {
@@ -349,27 +354,34 @@ bool InfileMerger::_applyMysqlMyIsam(std::string const& query) {
                 sleep(1);
                 lock.lock();
             } else {
-                LOGS(_log, LOG_LVL_ERROR, "InfileMerger::_applyMysql _setupConnection() failed!!!");
+                LOGS(_log, LOG_LVL_ERROR,
+                     "InfileMerger::_applyMysqlMyIsam _setupConnectionMyIsam() failed!!!");
                 return false;  // Reconnection failed. This is an error.
             }
         }
     }
 
     int rc = mysql_real_query(_mysqlConn.getMySql(), query.data(), query.size());
-    return rc == 0;
+    if (rc == 0) return true;
+    LOGS(_log, LOG_LVL_ERROR,
+         "InfileMerger::_applyMysqlMyIsam mysql_real_query() " + ::lastMysqlError(_mysqlConn.getMySql()));
+    return false;
 }
 
 bool InfileMerger::_applyMysqlInnoDb(std::string const& query) {
     mysql::MySqlConnection mySConn(_config.mySqlConfig);
     if (!mySConn.connected()) {
         if (!_setupConnectionInnoDb(mySConn)) {
-            LOGS(_log, LOG_LVL_ERROR, "InfileMerger::_applyMysql _setupConnection() failed!!!");
+            LOGS(_log, LOG_LVL_ERROR, "InfileMerger::_applyMysqlInnoDb _setupConnectionInnoDb() failed!!!");
             return false;  // Reconnection failed. This is an error.
         }
     }
 
     int rc = mysql_real_query(mySConn.getMySql(), query.data(), query.size());
-    return rc == 0;
+    if (rc == 0) return true;
+    LOGS(_log, LOG_LVL_ERROR,
+         "InfileMerger::_applyMysqlInnoDb mysql_real_query() " + ::lastMysqlError(mySConn.getMySql()));
+    return false;
 }
 
 bool InfileMerger::_setupConnectionInnoDb(mysql::MySqlConnection& mySConn) {