feat: Devbox Scheduled shutdown. #5559

bearslyricattack · 2025-04-25T07:04:05Z

No description provided.

codecov · 2025-04-25T07:09:13Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.97%. Comparing base (0aabb5f) to head (8bf24e0).
Report is 65 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #5559   +/-   ##
=======================================
  Coverage   61.97%   61.97%           
=======================================
  Files           8        8           
  Lines         647      647           
=======================================
  Hits          401      401           
  Misses        200      200           
  Partials       46       46

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

lingdie · 2025-04-25T07:13:12Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+		return ctrl.Result{}, err
+	}
+
+	if scheduledShutdown.Status.State == devboxv1alpha1.ShutdownStateCompleted {


考虑删除掉完成的

already fix it.

lingdie · 2025-04-25T07:13:46Z

controllers/devbox/api/v1alpha1/scheduledshutdown_types.go

+
+const (
+	// ShutdownStatePending indicates the shutdown is scheduled but not yet executed
+	ShutdownStatePending ShutdownState = "Pending"


ShutdownState 名字不合适，crd的名字也不合适 crd叫 DevBoxSchedue，这里的state叫ScheduleState吧

因为devbox有stop/shutdown两种状态了

already fix it.

lingdie · 2025-04-25T07:17:07Z

controllers/devbox/api/v1alpha1/scheduledshutdown_types.go

+
+	// Format: RFC3339 (e.g., "2006-01-02T15:04:05Z")
+	// +kubebuilder:validation:Required
+	ShutdownTime metav1.Time `json:"shutdownTime"`


这里应该是 scheduledTime

already fix it.

lingdie · 2025-04-25T07:17:22Z

controllers/devbox/api/v1alpha1/scheduledshutdown_types.go

+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=Stopped
+	ShutdownType ShutdownType `json:"shutdownType"`


类型预留shutdown，或者考虑支持更多，比如定时、运行多久后停止的类型这种

already fix it.

lingdie · 2025-04-25T07:18:02Z

controllers/devbox/api/v1alpha1/scheduledshutdown_types.go

+// ScheduledShutdownSpec defines the desired state of ScheduledShutdown.
+type ScheduledShutdownSpec struct {
+	// +kubebuilder:validation:Required
+	DevBoxName string `json:"devBoxName"`


这里新增devbox uid

already fix it.

lingdie · 2025-04-25T07:20:36Z

controllers/devbox/api/v1alpha1/scheduledshutdown_types.go

+type ScheduledShutdownStatus struct {
+	// State represents the current state of the scheduled shutdown
+	// +kubebuilder:default=Unknown
+	State ShutdownState `json:"state,omitempty"`


already fix it.

lingdie · 2025-04-25T08:00:54Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+	}
+
+	var devbox devboxv1alpha1.Devbox
+	if err := r.Get(ctx, types.NamespacedName{Name: scheduledShutdown.Spec.DevBoxName, Namespace: scheduledShutdown.Namespace}, &devbox); err != nil {


添加devbox uid后判断uid是否一致

lingdie · 2025-04-25T08:01:46Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+	if err := r.Get(ctx, types.NamespacedName{Name: scheduledShutdown.Spec.DevBoxName, Namespace: scheduledShutdown.Namespace}, &devbox); err != nil {
+		if errors.IsNotFound(err) {
+			logger.Error(err, "DevBox not found", "DevBoxName", scheduledShutdown.Spec.DevBoxName)
+			return r.updateStatus(ctx, &scheduledShutdown, devboxv1alpha1.ShutdownStateUnknown)


这里增加状态，uuid不匹配/devbox没找到的状态，既然能找到原因就将原因记录下来

already fix it.

lingdie · 2025-04-25T08:03:52Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+	return ctrl.Result{}, nil
+}
+
+// calculateRequeueTime 计算下一次重新队列的时间间隔，使用递减策略


使用英文注释

already fix it.

lingdie · 2025-04-25T08:05:29Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+
+// calculateRequeueTime 计算下一次重新队列的时间间隔，使用递减策略
+func calculateRequeueTime(now time.Time, shutdownTime time.Time) time.Duration {
+	totalWaitDuration := shutdownTime.Sub(now)


如果是负的了怎么办？

关机时间判断抽离出函数，然后多写些测试用例测试

already fix it.

lingdie · 2025-04-25T08:07:22Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+	shutdownTime := scheduledShutdown.Spec.ShutdownTime.Time
+	if now.After(shutdownTime) {
+		logger.Info("Shutdown time reached, performing shutdown", "DevBoxName", scheduledShutdown.Spec.DevBoxName, "ShutdownType", scheduledShutdown.Spec.ShutdownType)
+		//shutdown
+		if err := r.performShutdown(ctx, &devbox, scheduledShutdown.Spec.ShutdownType); err != nil {
+			logger.Error(err, "Failed to perform shutdown", "DevBoxName", scheduledShutdown.Spec.DevBoxName)
+			return r.updateStatus(ctx, &scheduledShutdown, devboxv1alpha1.ShutdownStateUnknown)
+		}
+		return r.updateStatus(ctx, &scheduledShutdown, devboxv1alpha1.ShutdownStateCompleted)
+	}


添加注释在这一段

already fix it.

lingdie · 2025-04-25T08:08:59Z

controllers/devbox/internal/controller/scheduledshutdown_controller.go

+	default:
+		logger.Error(errors.NewBadRequest("Unknown shutdown type"), "DevBoxName", devbox.Name, "ShutdownType", shutdownType)
+	}
+	return r.Update(ctx, devbox)


这里得考虑在reconcile过程中devbox变化，以及 default状态下就不需要更新devbox了

already fix it.

lingdie · 2025-04-29T02:40:32Z

controllers/devbox/internal/controller/devboxschedule_controller.go

+	var devboxSchedule devboxv1alpha1.DevBoxSchedule
+	if err := r.Get(ctx, req.NamespacedName, &devboxSchedule); err != nil {
+		if errors.IsNotFound(err) {
+			logger.Info("DevboxSchedule resource not found. Ignoring since object must be deleted")


typo error.

already fix it.

lingdie · 2025-04-29T02:47:09Z

controllers/devbox/internal/controller/devboxschedule_controller.go

+	if err := r.Get(ctx, types.NamespacedName{Name: devboxSchedule.Spec.DevBoxName, Namespace: devboxSchedule.Namespace}, &devbox); err != nil {
+		if errors.IsNotFound(err) {
+			logger.Error(err, "DevBox not found", "DevBoxName", devboxSchedule.Spec.DevBoxName)
+			return r.updateStatus(ctx, &devboxSchedule, devboxv1alpha1.ScheduleStateNotFound)


check uuid here.

already fix it.

lingdie · 2025-04-29T02:50:20Z

controllers/devbox/internal/controller/devboxschedule_controller.go

+	if devboxSchedule.Status.State == devboxv1alpha1.ScheduleStateCompleted {
+		logger.Info("Schedule already completed, deleting the CR")
+		if err := r.Delete(ctx, &devboxSchedule); err != nil {
+			logger.Error(err, "Failed to delete completed DevboxSchedule")
+			return ctrl.Result{}, err
+		}
+		logger.Info("Successfully deleted completed DevboxSchedule")
+		return ctrl.Result{}, nil
+	}


对只有pending状态的才去get devbox, 这里使用switch判断下schedule状态做具体操作

already fix it.

lingdie · 2025-04-29T02:51:11Z

controllers/devbox/internal/controller/devboxschedule_controller.go

+func calculateRequeueTime(now time.Time, shutdownTime time.Time) time.Duration {
+	totalWaitDuration := shutdownTime.Sub(now)
+	var requeueAfter time.Duration
+	switch {
+	case totalWaitDuration > 24*time.Hour:
+		requeueAfter = 24 * time.Hour
+	case totalWaitDuration > 6*time.Hour:
+		requeueAfter = 6 * time.Hour
+	case totalWaitDuration > 1*time.Hour:
+		requeueAfter = 1 * time.Hour
+	case totalWaitDuration > 10*time.Minute:
+		requeueAfter = 10 * time.Minute
+	default:
+		requeueAfter = totalWaitDuration
+	}
+	if now.Add(requeueAfter).After(shutdownTime) {
+		requeueAfter = totalWaitDuration
+	}
+	return requeueAfter
+}


尽量别硬编码，或者换种方式的硬编码，阶梯式弄个数组出来判断

already fix it.

stale · 2025-07-11T11:22:45Z

This issue has been automatically closed because we haven't heard back for more than 60 days, please reopen this issue if necessary.

bearslyricattack added 4 commits April 24, 2025 14:30

feat：add scheduled shutdown.

87407d5

change requeue after logic.

b47d6b9

change enum type.

f9f7aa2

change enum type.

8bf24e0

pull-request-size bot added the size/XL label Apr 25, 2025

github-actions bot added area/cloud area/test labels Apr 25, 2025

lingdie requested changes Apr 25, 2025

View reviewed changes

fix bug.

979d2cf

lingdie reviewed Apr 29, 2025

View reviewed changes

bearslyricattack added 12 commits April 29, 2025 11:01

fix bug.

3b520ca

fix bug.

ea258d0

fix bug.

5b9d256

fix bug.

7c2ee8a

fix bug.

6b2ba71

fix bug.

a01d2f9

fix bug.

ad01f15

fix bug.

95cc0ee

fix bug.

894d300

add shutdown.

2d9729f

fix bug.

8759504

fix bug.

dfa3322

stale bot added the response-expired label Jul 11, 2025

feat: Devbox Scheduled shutdown. #5559

Are you sure you want to change the base?

feat: Devbox Scheduled shutdown. #5559

Uh oh!

Conversation

bearslyricattack commented Apr 25, 2025

Uh oh!

codecov bot commented Apr 25, 2025

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stale bot commented Jul 11, 2025

Uh oh!