feat(cron): added removal of old builder images

main
Jef Roosens 2022-04-30 18:38:24 +02:00
parent 369b4458c5
commit fb65efdfbe
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
3 changed files with 28 additions and 8 deletions

View File

@ -2,7 +2,6 @@ module daemon
import time import time
import sync.stdatomic import sync.stdatomic
import rand
import build import build
const build_empty = 0 const build_empty = 0
@ -63,9 +62,9 @@ fn (mut d Daemon) start_build(sb ScheduledBuild) bool {
// run_build actually starts the build process for a given repo. // run_build actually starts the build process for a given repo.
fn (mut d Daemon) run_build(build_index int, sb ScheduledBuild) ? { fn (mut d Daemon) run_build(build_index int, sb ScheduledBuild) ? {
d.linfo('started build: ${sb.repo.url} ${sb.repo.branch}') d.linfo('started build: $sb.repo.url $sb.repo.branch')
build.build_repo(d.address, d.api_key, d.builder_image, &sb.repo) ? build.build_repo(d.address, d.api_key, d.builder_images.last(), &sb.repo) ?
stdatomic.store_u64(&d.atomics[build_index], daemon.build_done) stdatomic.store_u64(&d.atomics[build_index], daemon.build_done)
} }

View File

@ -7,6 +7,7 @@ import datatypes { MinHeap }
import cron.expression { CronExpression, parse_expression } import cron.expression { CronExpression, parse_expression }
import math import math
import build import build
import docker
struct ScheduledBuild { struct ScheduledBuild {
pub: pub:
@ -24,7 +25,7 @@ mut:
address string address string
api_key string api_key string
base_image string base_image string
builder_image string builder_images []string
global_schedule CronExpression global_schedule CronExpression
api_update_frequency int api_update_frequency int
image_rebuild_frequency int image_rebuild_frequency int
@ -92,6 +93,9 @@ pub fn (mut d Daemon) run() ? {
// made sure it isn't being used anymore. // made sure it isn't being used anymore.
if time.now() >= d.image_build_timestamp { if time.now() >= d.image_build_timestamp {
d.rebuild_base_image() ? d.rebuild_base_image() ?
// In theory, executing this function here allows an old builder
// image to exist for at most image_rebuild_frequency minutes.
d.clean_old_base_images()
} }
// Schedules new builds when possible // Schedules new builds when possible
@ -144,7 +148,7 @@ fn (mut d Daemon) schedule_build(repo_id string, repo git.GitRepo) ? {
} }
fn (mut d Daemon) renew_repos() ? { fn (mut d Daemon) renew_repos() ? {
d.ldebug('Renewing repos...') d.linfo('Renewing repos...')
mut new_repos := git.get_repos(d.address, d.api_key) ? mut new_repos := git.get_repos(d.address, d.api_key) ?
d.repos_map = new_repos.move() d.repos_map = new_repos.move()
@ -155,7 +159,7 @@ fn (mut d Daemon) renew_repos() ? {
// renew_queue replaces the old queue with a new one that reflects the newest // renew_queue replaces the old queue with a new one that reflects the newest
// values in repos_map. // values in repos_map.
fn (mut d Daemon) renew_queue() ? { fn (mut d Daemon) renew_queue() ? {
d.ldebug('Renewing queue...') d.linfo('Renewing queue...')
mut new_queue := MinHeap<ScheduledBuild>{} mut new_queue := MinHeap<ScheduledBuild>{}
// Move any jobs that should have already started from the old queue onto // Move any jobs that should have already started from the old queue onto
@ -186,8 +190,23 @@ fn (mut d Daemon) renew_queue() ? {
} }
fn (mut d Daemon) rebuild_base_image() ? { fn (mut d Daemon) rebuild_base_image() ? {
d.linfo("Rebuilding builder image....") d.linfo('Rebuilding builder image....')
d.builder_image = build.create_build_image(d.base_image) ? d.builder_images << build.create_build_image(d.base_image) ?
d.image_build_timestamp = time.now().add_seconds(60 * d.image_rebuild_frequency) d.image_build_timestamp = time.now().add_seconds(60 * d.image_rebuild_frequency)
} }
fn (mut d Daemon) clean_old_base_images() {
mut i := 0
for i < d.builder_images.len - 1 {
// For each builder image, we try to remove it by calling the Docker
// API. If the function returns an error or false, that means the image
// wasn't deleted. Therefore, we move the index over. If the function
// returns true, the array's length has decreased by one so we don't
// move the index.
if !docker.remove_image(d.builder_images[i]) or { false } {
i += 1
}
}
}

View File

@ -11,4 +11,6 @@ address = "http://localhost:8000"
global_schedule = '* *' global_schedule = '* *'
api_update_frequency = 2 api_update_frequency = 2
image_rebuild_frequency = 1
max_concurrent_builds = 3 max_concurrent_builds = 3