Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:0e26020d13a7f47c2d22f28c85bf492899336189
Branches Tags
Lubuntu:main
...
compare: Lubuntu:10d43282b6b645ff5d2a641d7119763d630e5388
Branches Tags
Lubuntu:main

2 Commits
0e26020d13 ... 10d43282b6

Author SHA1 Message Date
Simon Quigley
10d43282b6 Add the same to PackageConf syncs, and make logic more robust 2025-01-24 22:45:16 -06:00
Simon Quigley
d3d19f4f2a Add exponential backup for task retries 2025-01-24 22:39:16 -06:00
1 changed files with 18 additions and 6 deletions
Show Stats Expand all files Collapse all files

24
cpp/ci_database_objs.cpp
View File

@ -823,9 +823,9 @@ bool PackageConf::set_package_confs(QSqlDatabase& p_db) {
} }
void PackageConf::sync(QSqlDatabase& p_db) { void PackageConf::sync(QSqlDatabase& p_db) {
bool oneshot = true; bool task_succeeded = true;
while (oneshot) { int attempt = 0;
oneshot = false; while (!task_succeeded) {
try { try {
QSqlQuery query(p_db); QSqlQuery query(p_db);
@ -850,8 +850,13 @@ void PackageConf::sync(QSqlDatabase& p_db) {
query.addBindValue(branch->id); query.addBindValue(branch->id);
query.addBindValue(release->id); query.addBindValue(release->id);
if (!query.exec()) { attempt++;
qDebug() << "Failed to sync PackageConf:" << query.lastError().text(); task_succeeded = query.exec();
if (!task_succeeded) {
if (query.lastError().text().contains("database is locked")) {
int delay = 1000 * static_cast<int>(std::pow(2, attempt - 1));
std::this_thread::sleep_for(std::chrono::milliseconds(delay));
} else task_succeeded = true;
} }
} catch (...) {} } catch (...) {}
} }
@ -1228,6 +1233,7 @@ std::set<std::shared_ptr<Task>> Task::get_completed_tasks(QSqlDatabase& p_db, st
void Task::save(QSqlDatabase& p_db, int _packageconf_id) { void Task::save(QSqlDatabase& p_db, int _packageconf_id) {
bool task_succeeded = false; bool task_succeeded = false;
int attempt = 0;
while (!task_succeeded) { while (!task_succeeded) {
QSqlQuery query(p_db); QSqlQuery query(p_db);
query.prepare("UPDATE task SET jobstatus_id = ?, queue_time = ?, start_time = ?, finish_time = ?, successful = ?, log = ? WHERE id = ?"); query.prepare("UPDATE task SET jobstatus_id = ?, queue_time = ?, start_time = ?, finish_time = ?, successful = ?, log = ? WHERE id = ?");
@ -1239,7 +1245,13 @@ void Task::save(QSqlDatabase& p_db, int _packageconf_id) {
query.addBindValue(QString::fromStdString(std::regex_replace(log->get(), std::regex(R"(^\s+)"), ""))); query.addBindValue(QString::fromStdString(std::regex_replace(log->get(), std::regex(R"(^\s+)"), "")));
query.addBindValue(id); query.addBindValue(id);
task_succeeded = query.exec(); task_succeeded = query.exec();
if (!task_succeeded) qDebug() << "Failed to save task to database, retrying:" << query.lastError().text(); attempt++;
if (!task_succeeded) {
if (query.lastError().text().contains("database is locked")) {
int delay = 1000 * static_cast<int>(std::pow(2, attempt - 1));
std::this_thread::sleep_for(std::chrono::milliseconds(delay));
} else task_succeeded = true;
}
} }
QSqlQuery link_query(p_db); QSqlQuery link_query(p_db);