Skip to content

fix: make cleaner-agent mid-build usage thresholds configurable #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
openswe-shared-services wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix: make cleaner-agent mid-build usage thresholds configurable #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9717624
fix: make cleaner-agent mid-build usage thresholds configurable
open-swe Sep 17, 2026
552199a
fix: rename generic THRESHOLD locals for clarity
kim-codefresh Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cleaner/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,22 @@ To determine what to delete we will use information stored in /var/lib/docker/di

IMAGE_RETAIN_PERIOD - we will not delete images if they have events since `current_timestamp - IMAGE_RETAIN_PERIOD` (default 3d)
VOLUMES_RETAIN_PERIOD - we will not delete volumes if they have events since `current_timestamp - IMAGE_RETAIN_PERIOD` (default 3d)


DISK_USAGE_THRESHOLD - docker-clean.sh (pre-build) launches a clean if current disk usage exceeds this (default 0.8)
INODES_USAGE_THRESHOLD - docker-clean.sh (pre-build) launches a clean if current inode usage exceeds this (default 0.8)

CLEANER_AGENT_DISK_USAGE_THRESHOLD - cleaner-agent.sh's continuous, mid-build loop launches a clean if current disk usage exceeds this (default 0.9)
CLEANER_AGENT_INODES_USAGE_THRESHOLD - cleaner-agent.sh's continuous, mid-build loop launches a clean if current inode usage exceeds this (default 0.9)

####### defaults:
CLEAN_PERIOD_SECONDS=${CLEAN_PERIOD_SECONDS:-21600} # 6 hours
CLEAN_PERIOD_BUILDS=${CLEAN_PERIOD_BUILDS:-10}
IMAGE_RETAIN_PERIOD=${IMAGE_RETAIN_PERIOD:-259200}
VOLUMES_RETAIN_PERIOD=${VOLUMES_RETAIN_PERIOD:-259200}
DISK_USAGE_THRESHOLD=${DISK_USAGE_THRESHOLD:-0.8}
INODES_USAGE_THRESHOLD=${INODES_USAGE_THRESHOLD:-0.8}
CLEANER_AGENT_DISK_USAGE_THRESHOLD=${CLEANER_AGENT_DISK_USAGE_THRESHOLD:-0.9}
CLEANER_AGENT_INODES_USAGE_THRESHOLD=${CLEANER_AGENT_INODES_USAGE_THRESHOLD:-0.9}

##### Logic:
- save current docker events by `docker events --until 0s -f ${EVENT_FORMAT} > /var/lib/docker/dind-volume/events/$(date +%s)`
Expand Down
6 changes: 2 additions & 4 deletions cleaner/cleaner-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# examining usage threshold
#
echo "$0: - Entering at $(date) "
START_DISK_USAGE_THRESHOLD=0.9
START_INODES_USAGE_THRESHOLD=0.9

DIR=$(dirname ${BASH_SOURCE})

Expand Down Expand Up @@ -33,8 +31,8 @@ sigterm_trap(){
trap sigterm_trap SIGTERM SIGINT

need_to_clean() {
IS_DISK_USAGE_THRESHOLD=$(check_disk_usage_threshold ${START_DISK_USAGE_THRESHOLD})
IS_INODES_USAGE_THRESHOLD=$(check_inodes_usage_threshold ${START_INODES_USAGE_THRESHOLD})
IS_DISK_USAGE_THRESHOLD=$(check_disk_usage_threshold ${CLEANER_AGENT_DISK_USAGE_THRESHOLD})
IS_INODES_USAGE_THRESHOLD=$(check_inodes_usage_threshold ${CLEANER_AGENT_INODES_USAGE_THRESHOLD})
if [[ ${IS_DISK_USAGE_THRESHOLD} == 1 || ${IS_INODES_USAGE_THRESHOLD} == 1 ]]; then
echo 1
fi
Expand Down
7 changes: 7 additions & 0 deletions cleaner/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ VOLUMES_RETAIN_PERIOD=${VOLUMES_RETAIN_PERIOD:-259200}
DISK_USAGE_THRESHOLD=${DISK_USAGE_THRESHOLD:-0.8}
INODES_USAGE_THRESHOLD=${INODES_USAGE_THRESHOLD:-0.8}

# Thresholds used by cleaner-agent.sh's continuous, mid-build loop. Kept separate (and higher by
# default) from DISK_USAGE_THRESHOLD/INODES_USAGE_THRESHOLD above so it only steps in once the
# pre-build docker-clean.sh pass wasn't enough, but still overridable via the Runtime Environment
# spec like every other threshold here.
CLEANER_AGENT_DISK_USAGE_THRESHOLD=${CLEANER_AGENT_DISK_USAGE_THRESHOLD:-0.9}
CLEANER_AGENT_INODES_USAGE_THRESHOLD=${CLEANER_AGENT_INODES_USAGE_THRESHOLD:-0.9}

#### Defining DIND_VOLUME_STAT dir and stat files
DOCKERD_DATA_ROOT=${DOCKERD_DATA_ROOT:-/var/lib/docker}
DIND_VOLUME_STAT_DIR=${DIND_VOLUME_STAT_DIR:-${DOCKERD_DATA_ROOT}/dind-volume}
Expand Down
8 changes: 4 additions & 4 deletions cleaner/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ display_df(){
}

check_disk_usage_threshold(){
local THRESHOLD=${1:-${DISK_USAGE_THRESHOLD}}
df -P ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2 > T ) ? "1": "0" }'
local DISK_THRESHOLD=${1:-${DISK_USAGE_THRESHOLD}}
df -P ${DOCKERD_DATA_ROOT} | awk -v T=${DISK_THRESHOLD} 'NR==2 {print ( $3 / $2 > T ) ? "1": "0" }'
}

check_inodes_usage_threshold(){
local THRESHOLD=${1:-${DISK_USAGE_THRESHOLD}}
df -iP ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2 > T ) ? "1": "0" }'
local INODES_THRESHOLD=${1:-${INODES_USAGE_THRESHOLD}}
df -iP ${DOCKERD_DATA_ROOT} | awk -v T=${INODES_THRESHOLD} 'NR==2 {print ( $3 / $2 > T ) ? "1": "0" }'
}

clean_temporary_objects(){
Expand Down
Loading