Skip to content
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

Allow self-update check to be triggered via admin HTTP #279

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Allow self-update check to be triggered via admin HTTP #279

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
74 changes: 50 additions & 24 deletions trusted_applet/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func runWithNetworking(ctx context.Context) error {
return ctx.Err()
}

go updateChecker(ctx, updateCheckInterval)
triggerUpdate := updateChecker(ctx, updateCheckInterval)
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you want to increase the value updateCheckInterval also?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I thought I'd keep that separate so we could agree on what a good value for that should be first :)


listenCfg := &net.ListenConfig{}

Expand All @@ -320,6 +320,11 @@ func runWithNetworking(ctx context.Context) error {
srvMux.Handle("/metrics", promhttp.Handler())
srvMux.Handle("/crashlog", &logHandler{RPC: "RPC.CrashLog"})
srvMux.Handle("/consolelog", &logHandler{RPC: "RPC.ConsoleLog"})
srvMux.HandleFunc("/updatecheck", func(w http.ResponseWriter, _ *http.Request) {
triggerUpdate <- struct{}{}
w.Header().Add("Content-Type", "text/plain")
w.Write([]byte("ok, check /consolelog!"))
})
srv := &http.Server{
ReadTimeout: 5 * time.Second,
WriteTimeout: 10 * time.Second,
Expand Down Expand Up @@ -357,37 +362,58 @@ func runWithNetworking(ctx context.Context) error {
return ctx.Err()
}

func updateChecker(ctx context.Context, i time.Duration) {
func updateChecker(ctx context.Context, i time.Duration) chan<- struct{} {
var updateFetcher *update.Fetcher
var updateClient *update.Updater
var err error

t := time.NewTicker(i)
defer t.Stop()
for {
select {
case <-t.C:
if updateFetcher == nil || updateClient == nil {
updateFetcher, updateClient, err = updater(ctx)
if err != nil {
klog.Errorf("Failed to create updater: %v", err)
trigger := make(chan struct{}, 1)

go func(ctx context.Context) {
t := time.NewTicker(i)
defer t.Stop()
for {
select {
case <-t.C:
trigger <- struct{}{}
case <-ctx.Done():
close(trigger)
return
}
}
}(ctx)

go func(ctx context.Context) {
for {
select {
case _, ok := <-trigger:
if !ok {
return
}
if updateFetcher == nil || updateClient == nil {
updateFetcher, updateClient, err = updater(ctx)
if err != nil {
klog.Errorf("Failed to create updater: %v", err)
continue
}
}
counterFirmwareUpdateAttempt.Inc()
klog.V(1).Info("Scanning for available updates")
if err := updateFetcher.Scan(ctx); err != nil {
klog.Errorf("UpdateFetcher.Scan: %v", err)
continue
}
if err := updateClient.Update(ctx); err != nil {
klog.Errorf("Update: %v", err)
}
counterFirmwareUpdateSuccess.Inc()
case <-ctx.Done():
return
}
counterFirmwareUpdateAttempt.Inc()
klog.V(1).Info("Scanning for available updates")
if err := updateFetcher.Scan(ctx); err != nil {
klog.Errorf("UpdateFetcher.Scan: %v", err)
continue
}
if err := updateClient.Update(ctx); err != nil {
klog.Errorf("Update: %v", err)
}
counterFirmwareUpdateSuccess.Inc()
case <-ctx.Done():
return
}
}
}(ctx)

return trigger
}

func openStorage() *slots.Partition {
Expand Down