fix: less rounding of deadlines

coder · johnstcn · May 27, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit cfeb27463e7a752e34e8df85d52eb3c9ae1f72a5
diff --git a/cli/list.go b/cli/list.go
@@ -97,7 +97,7 @@ func list() *cobra.Command {
 				if workspace.TTL != nil {
 					autostopDisplay = durationDisplay(*workspace.TTL)
 					if has, ext := hasExtension(workspace); has {
-						autostopDisplay += fmt.Sprintf(" (+%s)", durationDisplay(ext))
+						autostopDisplay += fmt.Sprintf(" (+%s)", durationDisplay(ext.Round(time.Minute)))
 					}
 				}
 
@@ -131,8 +131,8 @@ func hasExtension(ws codersdk.Workspace) (bool, time.Duration) {
 	if ws.TTL == nil {
 		return false, 0
 	}
-	delta := ws.LatestBuild.Deadline.Add(-*ws.TTL).Sub(ws.LatestBuild.UpdatedAt).Round(time.Minute)
-	if delta <= 0 {
+	delta := ws.LatestBuild.Deadline.Add(-*ws.TTL).Sub(ws.LatestBuild.CreatedAt)
+	if delta < time.Minute {
 		return false, 0
 	}
 

diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -107,8 +107,9 @@ func (e *Executor) runOnce(t time.Time) error {
 					)
 					continue
 				}
-				// Truncate to nearest minute for consistency with autostart behavior
-				nextTransition = priorHistory.Deadline.Truncate(time.Minute)
+				// For stopping, do not truncate. This is inconsistent with autostart, but
+				// it ensures we will not stop too early.
+				nextTransition = priorHistory.Deadline
 			case database.WorkspaceTransitionStop:
 				validTransition = database.WorkspaceTransitionStart
 				sched, err := schedule.Weekly(ws.AutostartSchedule.String)

diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -550,7 +550,7 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr
 			workspace, err := db.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
 			if err == nil {
 				if workspace.Ttl.Valid {
-					workspaceDeadline = now.Add(time.Duration(workspace.Ttl.Int64)).Truncate(time.Minute)
+					workspaceDeadline = now.Add(time.Duration(workspace.Ttl.Int64))
 				}
 			} else {
 				// Huh? Did the workspace get deleted?

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -597,7 +597,7 @@ func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {
 			return xerrors.Errorf("workspace must be started, current status: %s", build.Transition)
 		}
 
-		newDeadline := req.Deadline.Truncate(time.Minute).UTC()
+		newDeadline := req.Deadline.UTC()
 		if newDeadline.IsZero() {
 			// This should not be possible because the struct validation field enforces a non-zero value.
 			code = http.StatusBadRequest
@@ -609,8 +609,8 @@ func (api *API) putExtendWorkspace(rw http.ResponseWriter, r *http.Request) {
 			return xerrors.Errorf("new deadline %q must be after existing deadline %q", newDeadline.Format(time.RFC3339), build.Deadline.Format(time.RFC3339))
 		}
 
-		// both newDeadline and build.Deadline are truncated to time.Minute
-		if newDeadline == build.Deadline {
+		// Disallow updates within than one minute
+		if withinDuration(newDeadline, build.Deadline, time.Minute) {
 			code = http.StatusNotModified
 			return nil
 		}
@@ -839,3 +839,12 @@ func convertSQLNullInt64(i sql.NullInt64) *time.Duration {
 
 	return (*time.Duration)(&i.Int64)
 }
+
+func withinDuration(t1, t2 time.Time, d time.Duration) bool {
+	dt := t1.Sub(t2)
+	if dt < -d || dt > d {
+		return false
+	}
+
+	return true
+}