fix hang on start

gravitational · Feb 28, 2025 · e0ff6a0 · e0ff6a0
1 parent ff81306
commit e0ff6a0
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/tool/teleport-update/main.go b/tool/teleport-update/main.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
 	"github.com/gravitational/trace"
 	"gopkg.in/yaml.v3"
@@ -53,6 +54,8 @@ const (
 	updateGroupEnvVar = "TELEPORT_UPDATE_GROUP"
 	// updateVersionEnvVar forces the version to specified value.
 	updateVersionEnvVar = "TELEPORT_UPDATE_VERSION"
+	// updateLockTimeout is the duration commands will wait for update to complete before failing.
+	updateLockTimeout = 10 * time.Minute
 )
 
 var plog = logutils.NewPackageLogger(teleport.ComponentKey, teleport.ComponentUpdater)
@@ -274,7 +277,7 @@ func cmdDisable(ctx context.Context, ccfg *cliConfig) error {
 	if err != nil {
 		return trace.Wrap(err, "failed to initialize updater")
 	}
-	unlock, err := libutils.FSWriteLock(lockFile)
+	unlock, err := libutils.FSTryWriteLockTimeout(ctx, lockFile, updateLockTimeout)
 	if err != nil {
 		return trace.Wrap(err, "failed to grab concurrent execution lock %s", lockFile)
 	}
@@ -295,7 +298,7 @@ func cmdUnpin(ctx context.Context, ccfg *cliConfig) error {
 	if err != nil {
 		return trace.Wrap(err, "failed to setup updater")
 	}
-	unlock, err := libutils.FSWriteLock(lockFile)
+	unlock, err := libutils.FSTryWriteLockTimeout(ctx, lockFile, updateLockTimeout)
 	if err != nil {
 		return trace.Wrap(err, "failed to grab concurrent execution lock %n", lockFile)
 	}
@@ -318,7 +321,7 @@ func cmdInstall(ctx context.Context, ccfg *cliConfig) error {
 	}
 
 	// Ensure enable can't run concurrently.
-	unlock, err := libutils.FSWriteLock(lockFile)
+	unlock, err := libutils.FSTryWriteLockTimeout(ctx, lockFile, updateLockTimeout)
 	if err != nil {
 		return trace.Wrap(err, "failed to grab concurrent execution lock %s", lockFile)
 	}
@@ -340,7 +343,12 @@ func cmdUpdate(ctx context.Context, ccfg *cliConfig) error {
 		return trace.Wrap(err, "failed to initialize updater")
 	}
 	// Ensure update can't run concurrently.
-	unlock, err := libutils.FSWriteLock(lockFile)
+	var unlock func() error
+	if ccfg.UpdateNow {
+		unlock, err = libutils.FSTryWriteLockTimeout(ctx, lockFile, updateLockTimeout)
+	} else {
+		unlock, err = libutils.FSWriteLock(lockFile)
+	}
 	if err != nil {
 		return trace.Wrap(err, "failed to grab concurrent execution lock %s", lockFile)
 	}
@@ -456,7 +464,7 @@ func cmdUninstall(ctx context.Context, ccfg *cliConfig) error {
 		return trace.Wrap(err, "failed to initialize updater")
 	}
 	// Ensure update can't run concurrently.
-	unlock, err := libutils.FSWriteLock(lockFile)
+	unlock, err := libutils.FSTryWriteLockTimeout(ctx, lockFile, updateLockTimeout)
 	if err != nil {
 		return trace.Wrap(err, "failed to grab concurrent execution lock %s", lockFile)
 	}