Ensure TUF autoupdater finishes updates (when not performing download…

…) quicker

pkg/autoupdate/tuf/autoupdate.go

@@ -87,7 +87,7 @@ func NewTufAutoupdater(k types.Knapsack, metadataHttpClient *http.Client, mirror
 		checkInterval:          k.AutoupdateInterval(),
 		store:                  k.AutoupdateErrorsStore(),
 		osquerier:              osquerier,
-		osquerierRetryInterval: 1 * time.Minute,
+		osquerierRetryInterval: 30 * time.Second,
 		logger:                 log.NewNopLogger(),
 	}
 
@@ -184,10 +184,10 @@ func (ta *TufAutoupdater) Execute() (err error) {
 }
 
 func (ta *TufAutoupdater) Interrupt(_ error) {
-	ta.interrupt <- struct{}{}
 	if err := ta.libraryManager.Close(); err != nil {
 		level.Debug(ta.logger).Log("msg", "could not close library on interrupt", "err", err)
 	}
+	ta.interrupt <- struct{}{}
 }
 
 // tidyLibrary gets the current running version for each binary (so that the current version is not removed)
@@ -306,6 +306,10 @@ func (ta *TufAutoupdater) downloadUpdate(binary autoupdatableBinary, targets dat
 		return "", fmt.Errorf("could not find release: %w", err)
 	}
 
+	if ta.libraryManager.Available(binary, release) {
+		return "", nil
+	}
+
 	// Get the current running version if available -- don't error out if we can't
 	// get it, since the worst case is that we download an update whose version matches
 	// our install version.
@@ -315,10 +319,6 @@ func (ta *TufAutoupdater) downloadUpdate(binary autoupdatableBinary, targets dat
 		return "", nil
 	}
 
-	if ta.libraryManager.Available(binary, release) {
-		return "", nil
-	}
-
 	if err := ta.libraryManager.AddToLibrary(binary, currentVersion, release, releaseMetadata); err != nil {
 		return "", fmt.Errorf("could not add release %s for binary %s to library: %w", release, binary, err)
 	}

pkg/autoupdate/tuf/library_manager.go

@@ -69,6 +69,12 @@ func newUpdateLibraryManager(mirrorUrl string, mirrorClient *http.Client, baseDi
 
 // Close cleans up the temporary staging directory
 func (ulm *updateLibraryManager) Close() error {
+	// Acquire lock to ensure we aren't interrupting an ongoing operation
+	for _, binary := range binaries {
+		ulm.lock.Lock(binary)
+		defer ulm.lock.Unlock(binary)
+	}
+
 	if err := os.RemoveAll(ulm.stagingDir); err != nil {
 		return fmt.Errorf("could not remove staging dir %s: %w", ulm.stagingDir, err)
 	}