Skip to content

Improve the node package list updates #17704

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
merged 1 commit into from
Oct 24, 2025
Merged

Improve the node package list updates #17704

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
34 changes: 15 additions & 19 deletions upup/pkg/fi/nodeup/nodetasks/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ func (_ *Package) CheckChanges(a, e, changes *Package) error {
// It just avoids unnecessary failures from running e.g. concurrent apt-get installs
var packageManagerLock sync.Mutex

// packageManagerLastUpdated is the last time the package manager update was done
var packageManagerLastUpdated time.Time

func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) error {
packageManagerLock.Lock()
defer packageManagerLock.Unlock()
Expand Down Expand Up @@ -326,27 +329,18 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
env = append(env, "DEBIAN_FRONTEND=noninteractive")
}

if d.IsDebianFamily() {
// Each time apt-get install is run, the timestamp of /var/lib/dpkg/status is updated.
// To avoid unnecessary apt-get update calls, we check the timestamp of this file.
// If it is newer than 10 minutes, we skip apt-get update.
stat, err := os.Stat("/var/lib/dpkg/status")
// If the package manager update was less than 10 minutes ago, skip updating the package list.
if d.IsDebianFamily() && time.Since(packageManagerLastUpdated) > 10*time.Minute {
Copy link
Member

@ameukam ameukam Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 10 min ? I think apt update take less than 5 min to run.

Copy link
Member Author

@hakman hakman Oct 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is meant to run apt-get update every 10 min (arbitrary number). I expect bootstrap to finish much faster, but seems reasonable.

args := []string{"apt-get", "update"}
klog.Infof("Running command %s", args)
cmd := exec.Command(args[0], args[1:]...)
cmd.Env = env
output, err := cmd.CombinedOutput()
if err != nil {
klog.Infof("Error getting dpkg status info: %v", err)
} else {
if stat.ModTime().After(time.Now().Add(-10 * time.Minute)) {
klog.Infof("Skipping package install as /var/lib/dpkg/status is newer than 10 minutes")
} else {
args := []string{"apt-get", "update"}
klog.Infof("Running command %s", args)
cmd := exec.Command(args[0], args[1:]...)
cmd.Env = env
output, err := cmd.CombinedOutput()
if err != nil {
klog.Infof("Error fetching the latest list of available packages: %v:\n%s", err, string(output))
}
}
return fmt.Errorf("error fetching the list of available packages: %v:\n%s", err, string(output))
}
// Successful package list update, updating the last updated time.
packageManagerLastUpdated = time.Now()
}

var args []string
Expand Down Expand Up @@ -387,6 +381,8 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
}
return fmt.Errorf("error installing package %q: %v: %s", e.Name, err, string(output))
}
// Successful package install, updating the last updated time.
packageManagerLastUpdated = time.Now()
} else {
if changes.Healthy != nil {
if d.IsDebianFamily() {
Expand Down
Loading