The point at which I realized I'm doing this wrong

ammario · ammario · commit 52f68e668f65 · 2022-09-20T02:36:25.000Z
diff --git a/coderd/httpmw/workspaceactivitybump.go b/coderd/httpmw/workspaceactivitybump.go
@@ -26,62 +26,73 @@ func ActivityBumpWorkspace(log slog.Logger, db database.Store) func(h http.Handl
 			// We run the bump logic asynchronously since the result doesn't
 			// affect the response.
 			go func() {
-				// We cannot use the Request context since the goroutine
-				// may be around after the request terminates.
-				// We set a short timeout so if the app is under load, these
-				// low priority operations fail first.
-				ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-				defer cancel()
+				bump := func() {
+					// We cannot use the Request context since the goroutine
+					// may be around after the request terminates.
+					// We set a short timeout so if the app is under load, these
+					// low priority operations fail first.
+					ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+					defer cancel()
 
-				err := db.InTx(func(s database.Store) error {
-					build, err := s.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspace.ID)
-					log.Debug(ctx, "build", slog.F("build", build))
-					if errors.Is(err, sql.ErrNoRows) {
-						return nil
-					} else if err != nil {
-						return xerrors.Errorf("get latest workspace build: %w", err)
-					}
+					err := db.InTx(func(s database.Store) error {
+						build, err := s.GetLatestWorkspaceBuildByWorkspaceID(ctx, workspace.ID)
+						log.Debug(ctx, "build", slog.F("build", build))
+						if errors.Is(err, sql.ErrNoRows) {
+							return nil
+						} else if err != nil {
+							return xerrors.Errorf("get latest workspace build: %w", err)
+						}
 
-					job, err := s.GetProvisionerJobByID(ctx, build.JobID)
-					if err != nil {
-						return xerrors.Errorf("get provisioner job: %w", err)
-					}
+						job, err := s.GetProvisionerJobByID(ctx, build.JobID)
+						if err != nil {
+							return xerrors.Errorf("get provisioner job: %w", err)
+						}
 
-					if build.Transition != database.WorkspaceTransitionStart || !job.CompletedAt.Valid {
-						return nil
-					}
+						if build.Transition != database.WorkspaceTransitionStart || !job.CompletedAt.Valid {
+							return nil
+						}
 
-					if build.Deadline.IsZero() {
-						// Workspace shutdown is manual
-						return nil
-					}
+						if build.Deadline.IsZero() {
+							// Workspace shutdown is manual
+							return nil
+						}
 
-					// We sent bumpThreshold slightly under bumpAmount to minimize DB writes.
-					const (
-						bumpAmount    = time.Hour
-						bumpThreshold = time.Hour - (time.Minute * 10)
-					)
+						// We sent bumpThreshold slightly under bumpAmount to minimize DB writes.
+						const (
+							bumpAmount    = time.Hour
+							bumpThreshold = time.Hour - (time.Minute * 10)
+						)
 
-					if !build.Deadline.Before(time.Now().Add(bumpThreshold)) {
-						return nil
-					}
+						if !build.Deadline.Before(time.Now().Add(bumpThreshold)) {
+							return nil
+						}
 
-					newDeadline := time.Now().Add(bumpAmount)
+						newDeadline := time.Now().Add(bumpAmount)
 
-					if err := s.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
-						ID:               build.ID,
-						UpdatedAt:        build.UpdatedAt,
-						ProvisionerState: build.ProvisionerState,
-						Deadline:         newDeadline,
-					}); err != nil {
-						return xerrors.Errorf("update workspace build: %w", err)
-					}
-					return nil
-				})
+						if err := s.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
+							ID:               build.ID,
+							UpdatedAt:        build.UpdatedAt,
+							ProvisionerState: build.ProvisionerState,
+							Deadline:         newDeadline,
+						}); err != nil {
+							return xerrors.Errorf("update workspace build: %w", err)
+						}
+						return nil
+					})
 
-				if err != nil {
-					log.Error(ctx, "bump failed", slog.Error(err))
+					if err != nil {
+						log.Error(ctx, "bump failed", slog.Error(err))
+					} else {
+						log.Debug(
+							ctx, "bumped deadline from activity",
+							slog.F("workspace_id", workspace.ID),
+						)
+					}
 				}
+				// For long running connections (e.g. web terminal), we need
+				// to bump periodically
+				// ticker := time.NewTicker(time.Minute)
+				bump()
 			}()
 			next.ServeHTTP(w, r)
 		})
