service/scheduler: schedule, rename retryInitialInterval to RetryWait

scylladb · Dec 27, 2021 · 32b9416 · 32b9416
1 parent 5cdbc1e
commit 32b9416
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/pkg/service/scheduler/details.go b/pkg/service/scheduler/details.go
@@ -22,12 +22,12 @@ func backoff(t *Task) retry.Backoff {
 	if t.Sched.NumRetries == 0 {
 		return nil
 	}
-	interval := t.Sched.RetryInitialInterval
-	if interval == 0 {
-		interval = duration.Duration(10 * time.Minute)
+	w := t.Sched.RetryWait
+	if w == 0 {
+		w = duration.Duration(10 * time.Minute)
 	}
 
-	b := retry.NewExponentialBackoff(interval.Duration(), 0, 0, 2, 0)
+	b := retry.NewExponentialBackoff(w.Duration(), 0, 0, 2, 0)
 	b = retry.WithMaxRetries(b, uint64(t.Sched.NumRetries))
 	return b
 }
diff --git a/pkg/service/scheduler/model.go b/pkg/service/scheduler/model.go
@@ -64,11 +64,11 @@ func (t *TaskType) UnmarshalText(text []byte) error {
 type Schedule struct {
 	gocqlx.UDT
 
-	Cron                 Cron              `json:"cron"`
-	StartDate            time.Time         `json:"start_date"`
-	Interval             duration.Duration `json:"interval" db:"interval_seconds"`
-	NumRetries           int               `json:"num_retries"`
-	RetryInitialInterval duration.Duration `json:"retry_initial_interval"`
+	Cron       Cron              `json:"cron"`
+	StartDate  time.Time         `json:"start_date"`
+	Interval   duration.Duration `json:"interval" db:"interval_seconds"`
+	NumRetries int               `json:"num_retries"`
+	RetryWait  duration.Duration `json:"retry_wait"`
 }
 
 func (s Schedule) trigger() scheduler.Trigger {

diff --git a/pkg/service/scheduler/service_integration_test.go b/pkg/service/scheduler/service_integration_test.go
@@ -417,7 +417,7 @@ func TestServiceScheduleIntegration(t *testing.T) {
 		Print("Given: task scheduled in future")
 		task := h.makeTaskWithStartDate(future)
 		task.Sched.NumRetries = 1
-		task.Sched.RetryInitialInterval = duration.Duration(10 * time.Millisecond)
+		task.Sched.RetryWait = duration.Duration(10 * time.Millisecond)
 		if err := h.service.PutTask(ctx, task); err != nil {
 			t.Fatal(err)
 		}
@@ -458,7 +458,7 @@ func TestServiceScheduleIntegration(t *testing.T) {
 		Print("When: task is scheduled with retry once")
 		task := h.makeTaskWithStartDate(now())
 		task.Sched.NumRetries = 1
-		task.Sched.RetryInitialInterval = duration.Duration(10 * time.Millisecond)
+		task.Sched.RetryWait = duration.Duration(10 * time.Millisecond)
 		if err := h.service.PutTask(ctx, task); err != nil {
 			t.Fatal(err)
 		}
@@ -563,9 +563,9 @@ func TestServiceScheduleIntegration(t *testing.T) {
 
 		Print("When: task is scheduled with retry once")
 		task := h.makeTask(scheduler.Schedule{
-			StartDate:            now(),
-			NumRetries:           1,
-			RetryInitialInterval: duration.Duration(10 * time.Millisecond),
+			StartDate:  now(),
+			NumRetries: 1,
+			RetryWait:  duration.Duration(10 * time.Millisecond),
 		})
 		if err := h.service.PutTask(ctx, task); err != nil {
 			t.Fatal(err)

diff --git a/schema/v3.0.0.cql b/schema/v3.0.0.cql
@@ -1,4 +1,4 @@
 ALTER TYPE schedule ADD cron text;
-ALTER TYPE schedule ADD retry_initial_interval bigint;
+ALTER TYPE schedule ADD retry_wait bigint;
 
 -- CALL rewriteHealthCheck30;