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

Attempt to fix assignment of commits

Browse Source
This commit is contained in:
Simon Quigley 2025-01-26 19:02:07 -06:00
parent 20a701641a
commit f98b9c04d8
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
cpp/ci_logic.cpp
View File

@ -1199,54 +1199,58 @@ std::vector<std::shared_ptr<PackageConf>> CiLogic::get_config(const std::string
std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>> repos, std::string CiLogic::queue_pull_tarball(std::vector<std::shared_ptr<PackageConf>> repos,
std::unique_ptr<TaskQueue>& task_queue, std::unique_ptr<TaskQueue>& task_queue,
std::shared_ptr<std::map<std::string, std::shared_ptr<JobStatus>>> job_statuses) { std::shared_ptr<std::map<std::string, std::shared_ptr<JobStatus>>> job_statuses)
{
std::string msg; std::string msg;
std::map<std::string, std::shared_ptr<package_conf_item>> encountered_items; std::map<std::string, std::shared_ptr<package_conf_item>> encountered_items;
std::mutex task_assignment_mutex; std::mutex task_assignment_mutex;
try { try {
for (auto r : repos) { for (auto &r : repos) {
bool is_ghost_pull = false;
// Attempt to find if we've seen this package->name before
std::lock_guard<std::mutex> lock(task_assignment_mutex); std::lock_guard<std::mutex> lock(task_assignment_mutex);
auto found_it = encountered_items.find(r->package->name); auto found_it = encountered_items.find(r->package->name);
std::shared_ptr<package_conf_item> new_item = std::make_shared<package_conf_item>();
if (found_it != encountered_items.end()) { if (found_it != encountered_items.end()) {
is_ghost_pull = true; // GHOST pull
auto existing_item = found_it->second;
r->assign_task(job_statuses->at("pull"), found_it->second->first_pull_task, r); // Assign tasks (reuse the same Task objects for "pull"/"tarball")
r->assign_task(job_statuses->at("tarball"), found_it->second->first_tarball_task, r); r->assign_task(job_statuses->at("pull"), existing_item->first_pull_task, r);
r->packaging_commit = found_it->second->packaging_commit; r->assign_task(job_statuses->at("tarball"), existing_item->first_tarball_task, r);
r->upstream_commit = found_it->second->upstream_commit;
sync(r);
continue; // Point packaging_commit/upstream_commit to the real pkgconf's pointers
r->packaging_commit = existing_item->first_pkgconf->packaging_commit;
r->upstream_commit = existing_item->first_pkgconf->upstream_commit;
r->sync();
} }
else {
// REAL pull
auto new_item = std::make_shared<package_conf_item>();
new_item->first_pkgconf = r;
task_queue->enqueue( // Enqueue "pull"
job_statuses->at("pull"), task_queue->enqueue(
[this, r](std::shared_ptr<Log> log) mutable { job_statuses->at("pull"),
pull_project(r, log); [this, r](std::shared_ptr<Log> log) mutable {
}, pull_project(r, log);
r r->sync();
); },
new_item->first_pull_task = r->get_task_by_jobstatus(job_statuses->at("pull")); r
);
new_item->first_pull_task = r->get_task_by_jobstatus(job_statuses->at("pull"));
task_queue->enqueue( // Enqueue "tarball"
job_statuses->at("tarball"), task_queue->enqueue(
[this, r](std::shared_ptr<Log> log) mutable { job_statuses->at("tarball"),
create_project_tarball(r, log); [this, r](std::shared_ptr<Log> log) mutable {
}, create_project_tarball(r, log);
r r->sync();
); },
new_item->first_tarball_task = r->get_task_by_jobstatus(job_statuses->at("tarball")); r
);
new_item->first_tarball_task = r->get_task_by_jobstatus(job_statuses->at("tarball"));
new_item->first_pkgconf = r; encountered_items[r->package->name] = new_item;
}
new_item->packaging_commit = r->packaging_commit;
new_item->upstream_commit = r->upstream_commit;
encountered_items[r->package->name] = new_item;
} }
msg = "Succeeded"; msg = "Succeeded";
} catch (...) { } catch (...) {