Skip to content

fix(fleet): wait for apt-daily/unattended-upgrades instead of failing on the apt lock #58

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

Merged
ralyodio merged 1 commit into from
Oct 14, 2026
Merged

fix(fleet): wait for apt-daily/unattended-upgrades instead of failing on the apt lock #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions packages/fleet-core/src/upgrade.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@ describe('upgradeCommandFor', () => {
expect(upgradeCommandFor('apt')).toContain('DEBIAN_FRONTEND=noninteractive')
})

it('waits for apt-daily or unattended-upgrades instead of failing on the apt lock', () => {
const apt = upgradeCommandFor('apt')!
expect(apt).toMatch(/pgrep -x 'apt\|apt-get\|dpkg'/)
for (const line of apt.split('\n').filter((l) => l.startsWith('apt-get'))) {
expect(line).toContain('DPkg::Lock::Timeout=600')
}
})

it('does not remove packages: upgrade, never dist-upgrade or autoremove', () => {
for (const manager of ['apt', 'dnf', 'yum', 'zypper', 'apk', 'pkg'] as const) {
expect(upgradeCommandFor(manager), manager).not.toMatch(/autoremove|dist-upgrade/)
Expand Down
17 changes: 15 additions & 2 deletions packages/fleet-core/src/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,23 @@ echo "dp_reboot=$reboot"
export function upgradeCommandFor(manager: PackageManager): string | null {
switch (manager) {
case 'apt':
// apt-daily and unattended-upgrades run apt on their own timers, and a
// fleet run that lands during one fails with "Could not get lock" even
// though the same command works by hand a minute later. So wait for
// them: first until no apt or dpkg process is left (unattended-upgr is
// not on the list because its shutdown helper idles forever), then let
// apt itself wait on the lock for whatever race remains. Both give up
// after ten minutes rather than hanging the run.
return [
'export DEBIAN_FRONTEND=noninteractive',
'apt-get update -qq',
'apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold upgrade',
'dp_waited=0',
"while command -v pgrep >/dev/null 2>&1 && pgrep -x 'apt|apt-get|dpkg' >/dev/null 2>&1 && [ $dp_waited -lt 600 ]; do",
' [ $dp_waited -eq 0 ] && echo "diskpush: another apt/dpkg run is in progress, waiting for it to finish."',
' sleep 5',
' dp_waited=$((dp_waited + 5))',
'done',
'apt-get -o DPkg::Lock::Timeout=600 update -qq',
'apt-get -y -o DPkg::Lock::Timeout=600 -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold upgrade',
].join('\n')
case 'dnf':
return 'dnf -y --refresh upgrade'
Expand Down
Loading